MSA-1683: This plays a chime whenever a door sensor is opened during a time frame. I bought a aeotec doorbell and couldn't find anything like this feature, so I wrote one.

build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'smartthings-slack'
 
 buildscript {
     dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.11"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.8"
     }
     repositories {
         mavenLocal()

devicetypes/capabilities/acceleration-sensor-capability.src/acceleration-sensor-capability.groovy

@@ -23,8 +23,8 @@ metadata {
 
 	tiles {
 		standardTile("acceleration", "device.acceleration", width: 2, height: 2) {
-			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#cccccc")
-			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#00A0DC")
+			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
+			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
 		}
 
 		main "acceleration"

devicetypes/capabilities/contact-sensor-capability.src/contact-sensor-capability.groovy

@@ -23,8 +23,8 @@ metadata {
 
 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#00A0DC")
-			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#e86d13")
+			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
+			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
 		}
 		main "contact"
 		details "contact"

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

@@ -27,7 +27,7 @@ metadata {
 	tiles {
 		standardTile("toggle", "device.lock", width: 2, height: 2) {
 			state "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
-			state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#00A0DC"
+			state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821"
 		}
 		standardTile("lock", "device.lock", inactiveLabel: false, decoration: "flat") {
 			state "default", label:'lock', action:"lock.lock", icon:"st.locks.lock.locked"

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

@@ -29,7 +29,7 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "on"
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 		}
 		main "switch"
 		details "switch"

devicetypes/capabilities/motion-sensor-capability.src/motion-sensor-capability.groovy

@@ -24,7 +24,7 @@ metadata {
 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
 			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
 		}
 		main "motion"
 		details "motion"

devicetypes/capabilities/presence-sensor-capability.src/presence-sensor-capability.groovy

@@ -24,7 +24,7 @@ metadata {
 	tiles {
 		standardTile("presence", "device.presence", width: 2, height: 2) {
 			state("not present", label:'not present', icon:"st.presence.tile.not-present", backgroundColor:"#ffffff")
-			state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#00A0DC")
+			state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#53a7c0")
 		}
 		main "presence"
 		details "presence"

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

@@ -31,7 +31,7 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 		}
 		main "switch"
 		details "switch"

devicetypes/capabilities/switch-level-capability.src/switch-level-capability.groovy

@@ -35,8 +35,8 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2) {
 			state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
-			state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#00A0DC"
+			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
+			state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#79b821"
 			state "turningOff", label:'${name}', icon:"st.switches.switch.off", backgroundColor:"#ffffff"
 		}
 		controlTile("levelSliderControl", "device.level", "slider", height: 2, width: 1, inactiveLabel: false) {

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

@@ -79,8 +79,8 @@ metadata {
 		standardTile("mode", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
 			state "off", label:'${name}', action:"thermostat.emergencyHeat", backgroundColor:"#ffffff"
 			state "emergencyHeat", label:'${name}', action:"thermostat.heat", backgroundColor:"#e86d13"
-			state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#e86d13"
-			state "cool", label:'${name}', action:"thermostat.off", backgroundColor:"#00A0DC"
+			state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#ffc000"
+			state "cool", label:'${name}', action:"thermostat.off", backgroundColor:"#269bd2"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
 			state "fanAuto", label:'${name}', action:"thermostat.fanOn", backgroundColor:"#ffffff"

devicetypes/capabilities/water-sensor-capability.src/water-sensor-capability.groovy

@@ -24,7 +24,7 @@ metadata {
 	tiles {
 		standardTile("water", "device.water", width: 2, height: 2) {
 			state "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"
-			state "wet", icon:"st.alarm.water.wet", backgroundColor:"#00A0DC"
+			state "wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
 		}
 
 		main "water"

devicetypes/com-obycode/beaconthing.src/beaconthing.groovy

@@ -37,7 +37,7 @@ metadata {
 
 	tiles {
 		standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
-			state("present", labelIcon:"st.presence.tile.present", backgroundColor:"#00A0DC")
+			state("present", labelIcon:"st.presence.tile.present", backgroundColor:"#53a7c0")
 			state("not present", labelIcon:"st.presence.tile.not-present", backgroundColor:"#ffffff")
 		}
 		valueTile("inRange", "device.inRangeFriendly", inactiveLabel: true, height:1, width:3, decoration: "flat") {

devicetypes/com-obycode/obything-music.src/obything-music.groovy

@@ -38,7 +38,7 @@ metadata {
 		// Main
 		standardTile("main", "device.status", width: 1, height: 1, canChangeIcon: true) {
 			state "paused", label:'Paused', action:"music Player.play", icon:"st.Electronics.electronics19", nextState:"playing", backgroundColor:"#ffffff"
-			state "playing", label:'Playing', action:"music Player.pause", icon:"st.Electronics.electronics19", nextState:"paused", backgroundColor:"#00A0DC"
+			state "playing", label:'Playing', action:"music Player.pause", icon:"st.Electronics.electronics19", nextState:"paused", backgroundColor:"#79b821"
 		}
 
 		// Row 1

devicetypes/doncaruana/strips-by-sensative.src/strips-by-sensative.groovy

@@ -1,438 +0,0 @@
-/**
- *  Strips by Sensative
- *  Device Handler by Don Caruana
- *
- *  Date: 2017-2-19
- *  Supported Command Classes per device specs
- *  
- *         Association v2
- *         Association Group Information
- *         Battery
- *         Binary Sensor
- *         Configuration
- *         Device Reset Local
- *         Manufacturer Specific
- *         Notification v4
- *         Powerlevel
- *         Version v2
- *         Wake Up v2
- *         ZWavePlus Info v2
- *
- *   Parm Size Description                                   Value
- *      1    1 Type of report to send                        1 (Default)-Notification Report, 0-Binary Sensor report, 2-Basic report
- *      2    1 LED Indication                                1 (Default)-On for event (ex. door opened), 0-Off
- * 
- *    This device handler will just override the smartthings default wakeup interval of 4 hours and set to 24 hours (manufacturer default)
- *      and check the battery once a day (no sooner than every 23 hours)
- */
-
-metadata {
-	definition (name: "Strips by Sensative", namespace: "doncaruana/Sensative", author: "Don Caruana, Sensative") {
-
-	capability "Contact Sensor"
-	capability "Configuration"
-	capability "Battery"
-	capability "Sensor"
-	capability "Refresh"
-		attribute "needUpdate", "string"
-        attribute "tamper" , "string"
-
-	fingerprint mfr:"019A", prod:"0003", model:"0003", deviceJoinName:"Strips by Sensative"
-	fingerprint deviceId:"0x0701", inClusters: "0x5E,0x86,0x72,0x30,0x70,0x71,0x5A,0x85,0x59,0x80,0x84,0x73"
-	fingerprint cc: "0x5E,0x86,0x72,0x30,0x70,0x71,0x5A,0x85,0x59,0x80,0x84,0x73", mfr:"019A", prod:"0003", model:"0003", deviceJoinName:"Strips by Sensative"
-	}
-
-	preferences {
-    	section ("configuration settings") {
-		input(
-			title : "Changes in Settings marked with  *  will not   take effect until the next device Wake Up."
-			,description : null
-			,type : "paragraph")
-		input "sendType", "enum", 
-			title: "* Reporting Type",
-			description: "Notification Report",
-			options:["binary": "Sensor Binary Report", "notification": "Notification Report", "basic": "Basic Report"],
-			defaultValue: "notification",
-			displayDuringSetup: false
-		input "wakeupInterval","enum",
-			title: "* Device Wake Up Interval",
-			description: "24 hours",
-			defaultValue: "86400",
-			required: false,
-			displayDuringSetup: false,
-			options: buildInterval()
-        input "led", "bool", 
-			title: "* LED On",
-			defaultValue: true,
-			displayDuringSetup: false
-		input "ignoreWakeup", "bool", 
-			title: "Ignore Manual Wake Up",
-			defaultValue: false,
-			displayDuringSetup: false
-		input "invertOutput", "bool", 
-			title: "Invert Open/Close Reporting",
-			defaultValue: false,
-			displayDuringSetup: false
-		}
-    }
-
-	tiles(scale: 2) {
-		multiAttributeTile(name:"contact", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
-				attributeState "open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
-				attributeState "closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
-			}
-		}
-		standardTile("tamper", "device.tamper", inactiveLabel: false, width: 4, height: 3) {
-			state "tamper", label:'${currentValue}', action:"refresh.refresh", backgroundColor:"#FFCC7B"
-		}
-		standardTile("configure", "device.needUpdate", inactiveLabel: false, width: 2, height: 2) {
-			state "NO" , label:'Synced', backgroundColor:"#B1D57D"
-			state "YES", label:'Pending changes', backgroundColor:"#FFCC7B"
-        }
-		standardTile("battery", "device.battery",  inactiveLabel: false, width: 2, height: 1) {
-			state "battery", label:'Battery: ${currentValue}%'
-		}
-
-		main (["contact"])
-		details(["contact","battery","tamper","configure"])
-	}
-
-	simulator {
-		// messages the device returns in response to commands it receives
-		status "open (basic)" : "command: 9881, payload: 00 20 01 FF"
-		status "closed (basic)" : "command: 9881 payload: 00 20 01 00"
-		status "open (notification)" : "command: 9881, payload: 00 71 05 06 FF 00 FF 06 16 00 00"
-		status "closed (notification)" : "command: 9881, payload: 00 71 05 06 00 00 FF 06 17 00 00"
-		status "wake up" : "command: 9881, payload: 00 84 07"
-		status "battery (100%)" : "command: 9881, payload: 00 80 03 64"
-		status "battery low" : "command: 9881, payload: 00 80 03 FF"
-	}
-}
-
-def configure() {
-	def commands = []  
-	state.lastupdate = now()
-	sendEvent(name: "tamper", value: "No Tamper", displayed: false)
-	log.debug "Listing all device parameters and defaults since this is a new inclusion"
-	commands << zwave.manufacturerSpecificV1.manufacturerSpecificGet().format()
-	commands << zwave.versionV1.versionGet().format()
-	commands << zwave.batteryV1.batteryGet().format()
-	commands << zwave.configurationV1.configurationGet(parameterNumber: 1).format()
-	commands << zwave.configurationV1.configurationGet(parameterNumber: 2).format()
-	commands << zwave.wakeUpV2.wakeUpIntervalSet(seconds: 86400, nodeid:zwaveHubNodeId).format()
-	commands << zwave.wakeUpV2.wakeUpIntervalGet().format()
-	commands << zwave.wakeUpV2.wakeUpNoMoreInformation().format()
-	delayBetween(commands, 1500)
-}
-
-private getCommandClassVersions() {
-	[
-		0x71: 3,  // Notification
-		0x5E: 2,  // ZwaveplusInfo
-		0x59: 1,  // AssociationGrpInfo
-		0x85: 2,  // Association
-		0x80: 1,  // Battery
-		0x70: 1,  // Configuration
-		0x5A: 1,  // DeviceResetLocally
-		0x72: 1,  // ManufacturerSpecific
-		0x73: 1,  // Powerlevel
-		0x84: 2,  // WakeUp
-		0x86: 1,  // Version
-		0x30: 1,  // Binary Sensor
-	]
-}
-
-// Parse incoming device messages to generate events
-def parse(String description) {
-	def result = []
-	def cmd
-	if (description.startsWith("Err 106")) {
-		state.sec = 0
-		result = createEvent( name: "secureInclusion", value: "failed", eventType: "ALERT",
-				descriptionText: "This sensor failed to complete the network security key exchange. If you are unable to control it via SmartThings, you must remove it from your network and add it again.")
-	} else if (description.startsWith("Err")) {
-		result = createEvent(descriptionText: "$device.displayName $description", isStateChange: true)
-	} else {
-		cmd = zwave.parse(description, commandClassVersions)
-		if (cmd) {
-			result = zwaveEvent(cmd)
-		}
-	}
-	if (result instanceof List) {
-		result = result.flatten()
-	}
-	log.debug "Parsed '$description' to $result"
-	return result
-}
-
-/**
-* Triggered when Done button is pushed on Preference Pane
-*/
-def updated()
-{
-	if(now() - state.lastupdate > 3000){
-		def isUpdateNeeded = "NO"
-		if(wakeupInterval != null && state.wakeupInterval != wakeupInterval) {isUpdateNeeded = "YES"}
-		if (sendType != null && sendType != state.sendType) {isUpdateNeeded = "YES"}
-		if (led != null && led != state.led) {isUpdateNeeded = "YES"}
-		state.lastupdate = now()
-		sendEvent(name:"needUpdate", value: isUpdateNeeded, displayed:false, isStateChange: true)
-	}
-}
-
-/**
-* Only device parameter changes require a state change 
-*/
-def update_settings()
-{
-	def cmds = []
-	def isUpdateNeeded = "NO"
-	if (state.wakeupInterval != wakeupInterval){
-		cmds << zwave.wakeUpV2.wakeUpIntervalSet(seconds: wakeupInterval.toInteger(), nodeid:zwaveHubNodeId).format()
-		cmds << "delay 1000"
-		cmds << zwave.wakeUpV2.wakeUpIntervalGet().format()
-	}
-	if (sendType != state.sendType){
-		cmds << zwave.configurationV1.configurationSet(parameterNumber: 1, size: 1, configurationValue: [sendType == "binary" ? 0 : sendType == "basic" ? 2 : 1]).format()
-		cmds << "delay 1000"
-		cmds << zwave.configurationV1.configurationGet(parameterNumber: 1).format()
-	}
-	if (led != state.led){
-		cmds << zwave.configurationV1.configurationSet(parameterNumber: 2, size: 1, configurationValue: [led == true ? 1 : 0]).format()
-		cmds << "delay 1000"
-		cmds << zwave.configurationV1.configurationGet(parameterNumber: 2).format()
-	}
-	cmds << "delay 1000"
-	sendEvent(name:"needUpdate", value: isUpdateNeeded, displayed:false, isStateChange: true)
-	return cmds
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.configurationv1.ConfigurationReport cmd) {
-	def name = ""
-	def value = ""
-	def tmpParm = cmd.parameterNumber
-
-	def reportValue = cmd.configurationValue[0]
-	switch (cmd.parameterNumber) {
-		case 1:
-			name = "sendType"
-			switch (reportValue) {
-				case 0:
-					value = "binary"
-					break
-				case 1:
-					value = "notification"
-					break
-				case 2:
-				  value = "basic"
-					break
-						default:
-						break
-			}
-			state.sendType = value
-			log.debug "sendType = $value"
-			break
-		case 2:
-			name = "led"
-			value = reportValue
-			log.debug "led = $value"
-			state.led = reportValue == 1 ? true : false
-			break
-		default:
-			break
-	}
-	sendEvent(name: name, value: value, displayed: true)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
-	def encapsulatedCommand = cmd.encapsulatedCommand(commandClassVersions)
-	log.debug "encapsulated: $encapsulatedCommand"
-	if (encapsulatedCommand) {
-		state.sec = 1
-		return zwaveEvent(encapsulatedCommand)
-	} else {
-		log.warn "Unable to extract encapsulated cmd from $cmd"
-		return [createEvent(descriptionText: cmd.toString())]
-	}
-}
-
-def sensorValueEvent(value) {
-	//If the invertOutput parameter is set, logically invert the output value
-	def flip = 0
-	if (state.sendType == "notification"){
-		flip = value ^ 0x1}
-	else{
-		flip = value ^ 0xFF}
-  if (invertOutput) {value = flip}
-	if (value) {
-		createEvent(name: "contact", value: "open", descriptionText: "$device.displayName is open")
-	} else {
-		createEvent(name: "contact", value: "closed", descriptionText: "$device.displayName is closed")
-	}
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
-	return sensorValueEvent(cmd.value)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
-	return sensorValueEvent(cmd.value)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensorbinaryv1.SensorBinaryReport cmd) {
-	return sensorValueEvent(cmd.sensorValue)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensoralarmv1.SensorAlarmReport cmd) {
-	return sensorValueEvent(cmd.sensorState)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cmd) {
-	def result = []
-	if (cmd.notificationType == 0x06 && cmd.event == 0x16) {
-		result << sensorValueEvent(1)
-	} else if (cmd.notificationType == 0x06 && cmd.event == 0x17) {
-		result << sensorValueEvent(0)
-	} else if (cmd.notificationType == 0x07) {
-		if (cmd.event == 0x00) {
-			if (cmd.eventParametersLength == 0 || cmd.eventParameter[0] != 3) {
-				result << createEvent(descriptionText: "$device.displayName covering replaced", isStateChange: true, displayed: false)
-			} else {
-				result << sensorValueEvent(0)
-			}
-		} else if (cmd.event == 0x01 || cmd.event == 0x02) {
-			result << sensorValueEvent(1)
-		} else if (cmd.event == 0x03) {
-			result << createEvent(descriptionText: "$device.displayName covering was removed", isStateChange: true)
-			if (!device.currentState("ManufacturerCode")) {
-				result << response(secure(zwave.manufacturerSpecificV1.manufacturerSpecificGet()))
-			}
-		} else if (cmd.event == 0x04) {
-				def timeString1 = new Date().format("MMM d", location.timeZone)
-				def timeString2 = new Date().format("hh:mm:ss", location.timeZone)
-				result << createEvent(name: "tamper", value: "Tampered\n${timeString1}\n${timeString2}", descriptionText: "$device.displayName was tampered with at ${timeString1} ${timeString2}", isStateChange: true)
-				if (!ignoreWakeup) {
-					sendEvent(name:"WakeUp", value: "Manual Wakeup", descriptionText: "${device.displayName} woke up", isStateChange: true, displayed: true)
-					result << doWakeup()
-				}
-		} else if (cmd.event == 0x05 || cmd.event == 0x06) {
-			result << createEvent(descriptionText: "$device.displayName detected glass breakage", isStateChange: true)
-		} else {
-			result << createEvent(descriptionText: "$device.displayName event $cmd.event ${cmd.eventParameter.inspect()}", isStateChange: true, displayed: false)
-		}
-	} else if (cmd.notificationType) {
-			result << createEvent(descriptionText: "$device.displayName notification $cmd.notificationType event $cmd.event ${cmd.eventParameter.inspect()}", isStateChange: true, displayed: false)
-	} else {
-			def value = cmd.v1AlarmLevel == 255 ? "active" : cmd.v1AlarmLevel ?: "inactive"
-			result << createEvent(name: "alarm $cmd.v1AlarmType", value: value, isStateChange: true, displayed: false)
-	}
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
-	def event = createEvent(name: "WakeUp", value: "Auto Wakeup", descriptionText: "${device.displayName} woke up", isStateChange: true, displayed: true)
-	def cmds = []
-
-	if (!device.currentState("ManufacturerCode")) {
-		cmds << zwave.manufacturerSpecificV1.manufacturerSpecificGet().format()
-		cmds << "delay 2000"
-	}
-	if (!state.lastbat || now() - state.lastbat > 23*60*60*1000) {  //check no sooner than once every 23 hours (once a day)
-		log.debug "checking battery"
-		event.descriptionText += ", requesting battery"
-		cmds << zwave.batteryV1.batteryGet().format()
-		cmds << "delay 2000"
-	} else {
-		log.debug "not checking battery, was updated ${(now() - state.lastbat)/60000 as int} min ago"
-	}
-	if (device.currentValue("needUpdate") == "YES") { cmds += update_settings() }
-	cmds << zwave.wakeUpV2.wakeUpNoMoreInformation().format()
-	return [event, response(cmds)]
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
-  def map = [ name: "battery", unit: "%" ]
-	if (cmd.batteryLevel == 0xFF) {
-		map.value = 1
-		map.descriptionText = "${device.displayName} has a low battery"
-		map.isStateChange = true
-	} else {
-		map.value = cmd.batteryLevel
-	}
-	def event = createEvent(map)
-	map.isStateChange = true
-	state.lastbat = now()
-	return [event]
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv1.ManufacturerSpecificReport cmd) {
-	def result = []
-	def manufacturerCode = String.format("%04X", cmd.manufacturerId)
-	def productTypeCode = String.format("%04X", cmd.productTypeId)
-	def productCode = String.format("%04X", cmd.productId)
-	def wirelessConfig = "ZWP"
-
-	updateDataValue("Manufacturer", cmd.manufacturerName)
-	updateDataValue("Manufacturer ID", manufacturerCode)
-	updateDataValue("Product Type", productTypeCode)
-	updateDataValue("Product Code", productCode)
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	return [createEvent(descriptionText: "$device.displayName: $cmd", displayed: false)]
-}
-
-private secure(physicalgraph.zwave.Command cmd) {
-	if (state.sec == 0) {  // default to secure
-		cmd.format()
-	} else {
-		zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
-	}
-}
-
-private secureSequence(commands, delay=200) {
-	delayBetween(commands.collect{ secure(it) }, delay)
-}
-
-def buildInterval() {
-	def intervalList = []
-   	intervalList << [ "0" : "Disabled" ]
-	intervalList << [ "1800" : "30 minutes" ]
-	intervalList << [ "3600" : "1 hour" ]
-	intervalList << [ "7200" : "2 hours" ]
-	intervalList << [ "10800" : "3 hours" ]
-	intervalList << [ "14400" : "4 hours" ]
-	intervalList << [ "18000" : "5 hours" ]
-	intervalList << [ "21600" : "6 hours" ]
-	intervalList << [ "36000" : "10 hours" ]
-	intervalList << [ "43200" : "12 hours" ]
-	intervalList << [ "86400" : "24 hours" ]
-}
-
-def doWakeup() {	
-	def cmds = []
-	cmds << "delay 2000"
-	if (device.currentValue("needUpdate") == "YES") { cmds += update_settings() }
-	cmds << zwave.wakeUpV2.wakeUpNoMoreInformation().format()
-	return response(cmds)
-}
-
-def refresh() {
- sendEvent(name: "tamper", value: "No Tamper", displayed: false)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd) {
-	def appversion = String.format("%02d.%02d", cmd.applicationVersion, cmd.applicationSubVersion)
-	def zprotoversion = String.format("%d.%02d", cmd.zWaveProtocolVersion, cmd.zWaveProtocolSubVersion)
-	updateDataValue("zWave Library", cmd.zWaveLibraryType.toString())
-	updateDataValue("Firmware", appversion)
-	updateDataValue("zWave Version", zprotoversion)
-	sendEvent(name: "Firmware", value: appversion, displayed: true)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpIntervalReport cmd) {
-	state.wakeupInterval = cmd.seconds.toString()
-	sendEvent(name: "wakeupInterval", value: state.wakeupInterval, displayed: true)
-}

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

@@ -34,8 +34,8 @@ metadata {
     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")
+            	attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
+                attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#79b821")
             }
             
             tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
@@ -44,7 +44,7 @@ metadata {
 			}  
         }
                 
-        valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
+        valueTile("battery", "device.battery", inactiveLabel: false, , width: 2, height: 2, decoration: "flat") {
             state "battery", label:'${currentValue}% battery', unit:""
         }
         

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

@@ -20,7 +20,6 @@ metadata {
 		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: ""
 	}
@@ -32,8 +31,8 @@ metadata {
     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")
+            	attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
+                attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#79b821")
             }
             
             tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
@@ -42,7 +41,7 @@ metadata {
 			}  
         }
                 
-        valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
+        valueTile("battery", "device.battery", inactiveLabel: false, , width: 2, height: 2, decoration: "flat") {
             state "battery", label:'${currentValue}% battery', unit:""
         }
         
@@ -200,9 +199,7 @@ 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

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

@@ -21,30 +21,28 @@ metadata {
 		capability "Tamper Alert"
 		capability "Temperature Measurement"
 		capability "Water Sensor"
-		capability "Health Check"
-
-		fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x22, 0x85, 0x59, 0x20, 0x80, 0x70, 0x56, 0x5A, 0x7A, 0x72, 0x8E, 0x71, 0x73, 0x98, 0x9C, 0x31, 0x86", outClusters: ""
-		fingerprint mfr:"010F", prod:"0B01", model:"2002"
-		fingerprint mfr:"010F", prod:"0B01", model:"1002"
+        
+        fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x22, 0x85, 0x59, 0x20, 0x80, 0x70, 0x56, 0x5A, 0x7A, 0x72, 0x8E, 0x71, 0x73, 0x98, 0x9C, 0x31, 0x86", outClusters: ""
 	}
 
 	simulator {
+    
 	}
-
-	tiles(scale: 2) {
-		multiAttributeTile(name:"FGFS", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app
-			tileAttribute("device.water", key:"PRIMARY_CONTROL") {
-				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) {
+    
+    tiles(scale: 2) {
+    	multiAttributeTile(name:"FGFS", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app
+        	tileAttribute("device.water", key:"PRIMARY_CONTROL") {
+            	attributeState("dry", icon:"st.alarm.water.dry", backgroundColor:"#79b821")
+            	attributeState("wet", icon:"st.alarm.water.wet", backgroundColor:"#ffa81e")
+            }
+            
+            tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
+				attributeState("active", label:'tamper active', backgroundColor:"#53a7c0")
+				attributeState("inactive", label:'tamper inactive', backgroundColor:"#ffffff")
+			}       
+        }
+        
+        valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
 			state "temperature", label:'${currentValue}°',
 			backgroundColors:[
 				[value: 31, color: "#153591"],
@@ -56,22 +54,22 @@ metadata {
 				[value: 96, color: "#bc2323"]
 			]
 		}
-
-		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
-		}
-
-		main "FGFS"
-		details(["FGFS","battery", "temperature"])
-	}
+       	        
+        valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        	state "battery", label:'${currentValue}% battery', unit:""
+        }
+        
+        main "FGFS"
+        details(["FGFS","battery", "temperature"])
+    }
 }
 
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parsing '${description}'"
 	def result = []
-
-	if (description.startsWith("Err 106")) {
+    
+    if (description.startsWith("Err 106")) {
 		if (state.sec) {
 			result = createEvent(descriptionText:description, displayed:false)
 		} else {
@@ -86,13 +84,13 @@ def parse(String description) {
 	} else if (description == "updated") {
 		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])
+        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)
-		}
-	}
+        if (cmd) {
+            log.debug "Parsed '${cmd}'"
+            zwaveEvent(cmd)
+        }
+    }
 }
 
 //security
@@ -109,7 +107,7 @@ def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulat
 //crc16
 def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd)
 {
-	def versions = [0x31: 5, 0x72: 2, 0x80: 1]
+    def versions = [0x31: 5, 0x72: 2, 0x80: 1]
 	def version = versions[cmd.commandClass as Integer]
 	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
 	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
@@ -123,124 +121,105 @@ def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd)
 def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd)
 {
 	def event = createEvent(descriptionText: "${device.displayName} woke up", displayed: false)
-	def cmds = []
-	// cmds << encap(zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1, scale: 0))
-	// cmds << "delay 500"
-	cmds << encap(zwave.batteryV1.batteryGet())
-	[event, response(cmds)]
+    def cmds = []
+    cmds << encap(zwave.batteryV1.batteryGet())
+    cmds << "delay 500"
+    cmds << encap(zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1, scale: 0))    
+    cmds << "delay 1200"
+    cmds << encap(zwave.wakeUpV1.wakeUpNoMoreInformation())
+    [event, response(cmds)]
 }
 
 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}"
+    log.debug "manufacturerName: ${cmd.manufacturerName}"
+    log.debug "productId:        ${cmd.productId}"
+    log.debug "productTypeId:    ${cmd.productTypeId}"
 }
 
 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
+    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 response_cmds = []
-	if (!device.currentState("temperature")) {
-		response_cmds << encap(zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1, scale: 0))
-	}
-	if (!getDataValue("version") && !zwaveInfo.ver) {
-		log.debug "Requesting Version Report"
-		response_cmds << "delay 500"
-		response_cmds << encap(zwave.versionV1.versionGet())
-	}
-	response_cmds << "delay 1000"
-	response_cmds << encap(zwave.wakeUpV2.wakeUpNoMoreInformation())
-	[[:], response(response_cmds)]
+        
+        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) {
-	updateDataValue("version", "${cmd.applicationVersion}.${cmd.applicationSubVersion}")
-	log.debug "applicationVersion:      ${cmd.applicationVersion}"
-	log.debug "applicationSubVersion:   ${cmd.applicationSubVersion}"
-	log.debug "zWaveLibraryType:        ${cmd.zWaveLibraryType}"
-	log.debug "zWaveProtocolVersion:    ${cmd.zWaveProtocolVersion}"
-	log.debug "zWaveProtocolSubVersion: ${cmd.zWaveProtocolSubVersion}"
+def zwaveEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd) {	
+    updateDataValue("version", "${cmd.applicationVersion}.${cmd.applicationSubVersion}")
+    log.debug "applicationVersion:      ${cmd.applicationVersion}"
+    log.debug "applicationSubVersion:   ${cmd.applicationSubVersion}"
+    log.debug "zWaveLibraryType:        ${cmd.zWaveLibraryType}"
+    log.debug "zWaveProtocolVersion:    ${cmd.zWaveProtocolVersion}"
+    log.debug "zWaveProtocolSubVersion: ${cmd.zWaveProtocolSubVersion}"
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
-	def result = []
 	def map = [:]
 	map.name = "battery"
 	map.value = cmd.batteryLevel == 255 ? 1 : cmd.batteryLevel.toString()
 	map.unit = "%"
-
-	result << createEvent(map)
-
-	if (!getDataValue("serialNumber")) {
-		result << response(encap(zwave.manufacturerSpecificV2.deviceSpecificGet()))
-	} else {
-		result << response(encap(zwave.wakeUpV2.wakeUpNoMoreInformation()))
-	}
-	result
+	map.displayed = true
+	createEvent(map)
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cmd) {
 	def map = [:]
-	if (cmd.notificationType == 5) {
-		switch (cmd.event) {
-			case 2:
-				map.name = "water"
-				map.value = "wet"
-				map.descriptionText = "${device.displayName} is ${map.value}"
+    if (cmd.notificationType == 5) {
+    	switch (cmd.event) {                
+        	case 2:
+            	map.name = "water"
+                map.value = "wet"
+                map.descriptionText = "${device.displayName} is ${map.value}"
+            	break
+                
+            case 0:
+            	map.name = "water"
+                map.value = "dry"
+                map.descriptionText = "${device.displayName} is ${map.value}"
+            	break
+        }
+    } else if (cmd.notificationType == 7) {
+    	switch (cmd.event) {
+        	case 0:
+            	map.name = "tamper"
+                map.value = "inactive"
+                map.descriptionText = "${device.displayName}: tamper alarm has been deactivated"
 				break
-
-			case 0:
-				map.name = "water"
-				map.value = "dry"
-				map.descriptionText = "${device.displayName} is ${map.value}"
-				break
-		}
-	} else if (cmd.notificationType == 7) {
-		switch (cmd.event) {
-			case 0:
-				map.name = "tamper"
-				map.value = "inactive"
-				map.descriptionText = "${device.displayName}: tamper alarm has been deactivated"
-				break
-
-			case 3:
-				map.name = "tamper"
-				map.value = "active"
-				map.descriptionText = "${device.displayName}: tamper alarm activated"
-				break
-		}
-	}
-
-	createEvent(map)
+                
+        	case 3:
+            	map.name = "tamper"
+                map.value = "active"
+                map.descriptionText = "${device.displayName}: tamper alarm activated"
+            	break
+        }
+    }
+    
+    createEvent(map)
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd) {
 	def map = [:]
 	if (cmd.sensorType == 1) {
-		// temperature
-		def cmdScale = cmd.scale == 1 ? "F" : "C"
-		map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmdScale, cmd.precision)
-		map.unit = getTemperatureScale()
-		map.name = "temperature"
-		map.displayed = true
+        // temperature
+        def cmdScale = cmd.scale == 1 ? "F" : "C"
+        map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmdScale, cmd.precision)
+        map.unit = getTemperatureScale()
+        map.name = "temperature"
+        map.displayed = true
 	}
-
-	createEvent(map)
+	
+    createEvent(map)
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLocallyNotification cmd) {
@@ -249,18 +228,19 @@ def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLoca
 
 def configure() {
 	log.debug "Executing 'configure'"
-	// Device wakes up every 4 hours, this interval of 8h 2m 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)//FGFS' default wake up interval
+    cmds += zwave.manufacturerSpecificV2.manufacturerSpecificGet()
+    cmds += zwave.manufacturerSpecificV2.deviceSpecificGet()
+    cmds += zwave.versionV1.versionGet()
+    cmds += zwave.batteryV1.batteryGet()
+    cmds += zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1, scale: 0)
+    cmds += zwave.associationV2.associationSet(groupingIdentifier:1, nodeId: [zwaveHubNodeId])
+    cmds += zwave.wakeUpV2.wakeUpNoMoreInformation()
 
-	// default initial state
-	sendEvent(name: "water", value: "dry")
-
-	def cmds = []
-
-	cmds << zwave.associationV2.associationSet(groupingIdentifier:1, nodeId: [zwaveHubNodeId])
-	cmds << zwave.batteryV1.batteryGet()  // other queries sent as response to BatteryReport
-
-	encapSequence(cmds, 200)
+	encapSequence(cmds, 500)
 }
 
 private secure(physicalgraph.zwave.Command cmd) {
@@ -269,7 +249,7 @@ private secure(physicalgraph.zwave.Command cmd) {
 
 private crc16(physicalgraph.zwave.Command cmd) {
 	//zwave.crc16EncapV1.crc16Encap().encapsulate(cmd).format()
-	"5601${cmd.format()}0000"
+    "5601${cmd.format()}0000"
 }
 
 private encapSequence(commands, delay=200) {
@@ -277,10 +257,13 @@ private encapSequence(commands, delay=200) {
 }
 
 private encap(physicalgraph.zwave.Command cmd) {
-	if (zwaveInfo.zw && !zwaveInfo.zw.contains("s")) {
-		// Secure inclusion failed
-		crc16(cmd)
-	} else {
-		secure(cmd)
-	}
-}
+	def secureClasses = [0x20, 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 }) {
+    	secure(cmd)
+    } else {
+    	crc16(cmd)
+    }
+}

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

@@ -22,7 +22,6 @@ metadata {
 		capability "Sensor"
 		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: ""
 	}
@@ -39,8 +38,8 @@ metadata {
             }
             
             tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
-				attributeState("active", label:'tamper active', backgroundColor:"#00a0dc")
-				attributeState("inactive", label:'tamper inactive', backgroundColor:"#cccccc")
+				attributeState("active", label:'tamper active', backgroundColor:"#53a7c0")
+				attributeState("inactive", label:'tamper inactive', backgroundColor:"#ffffff")
 			}  
         }
         
@@ -241,9 +240,7 @@ def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLoca
 
 def configure() {
 	log.debug "Executing 'configure'"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	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

devicetypes/johnrucker/coopboss-h3vx.src/coopboss-h3vx.groovy

@@ -112,10 +112,10 @@ metadata {
 		multiAttributeTile(name:"dtlsDoorCtrl", type:"generic", width:6, height:4) {tileAttribute("device.doorState", key: "PRIMARY_CONTROL") 
         	{
       		attributeState "unknown", label: '${name}', action:"openDoor", icon: "st.secondary.tools", nextState:"Sent"
-      		attributeState "open", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-open", backgroundColor: "#00A0DC", nextState:"Sent"
-            attributeState "opening", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-opening", backgroundColor: "#00A0DC"
-            attributeState "closed", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closed", backgroundColor: "#ffffff", nextState:"Sent"
-            attributeState "closing", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closing", backgroundColor: "#ffffff"
+      		attributeState "open", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-open", backgroundColor: "#0000ff", nextState:"Sent"
+            attributeState "opening", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-opening", backgroundColor: "#ffa81e" 
+            attributeState "closed", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closed", backgroundColor: "#79b821", nextState:"Sent"
+            attributeState "closing", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closing", backgroundColor: "#ffa81e" 
             attributeState "jammed", label: '${name}', action:"closeDoorHiI", icon: "st.doors.garage.garage-open", backgroundColor: "#ff0000", nextState:"Sent"
             attributeState "forced close", label: "forced", action:"openDoor", icon: "st.doors.garage.garage-closed", backgroundColor: "#ff8000", nextState:"Sent"
             attributeState "fault", label: 'FAULT', action:"openDoor", icon: "st.secondary.tools", backgroundColor: "#ff0000", nextState:"Sent"  

devicetypes/juano2310/jawbone-user.src/jawbone-user.groovy

@@ -24,7 +24,7 @@ metadata {
     tiles {
         standardTile("sleeping", "device.sleeping", width: 1, height: 1, canChangeIcon: false, canChangeBackground: false) {
             state("sleeping", label: "Sleeping", icon:"st.Bedroom.bedroom12", backgroundColor:"#ffffff")
-            state("not sleeping", label: "Awake", icon:"st.Health & Wellness.health12", backgroundColor:"#00A0DC")
+            state("not sleeping", label: "Awake", icon:"st.Health & Wellness.health12", backgroundColor:"#79b821")
         }
         standardTile("steps", "device.steps", width: 2, height: 2, canChangeIcon: false, canChangeBackground: false) {
             state("steps", label: '${currentValue} Steps', icon:"st.Health & Wellness.health11", backgroundColor:"#ffffff")                     

devicetypes/keen-home/keen-home-smart-vent.src/.st-ignore

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

devicetypes/keen-home/keen-home-smart-vent.src/README.md

@@ -1,39 +0,0 @@
-# Keen Home Smart Vent
-
-Cloud Execution
-
-Works with: 
-
-* [Keen Home Smart Vent](https://www.smartthings.com/works-with-smartthings/keen-home/keen-home-smart-vent)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Troubleshooting](#Troubleshooting)
-
-## Capabilities
-
-* **Switch** - can detect state (possible values: on/off)
-* **Switch Level** - represents current light level, usually 0-100 in percent
-* **Sensor** - detects sensor events
-* **Temperature Measurement** - represents capability to measure temperature
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Battery** - defines device uses a battery
-* **Refresh** - _refresh()_ command for status updates
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-Keen Home Smart Vent with reporting interval of 10 mins.
-SmartThings platform will ping the device after `checkInterval` seconds of inactivity in last attempt to reach the device before marking it `OFFLINE` 
-
-* __22min__ checkInterval
-
-## Troubleshooting
-
-If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
-Pairing needs to be tried again by placing the sensor closer to the hub.
-Instructions related to pairing, resetting and removing the different motion sensors from SmartThings can be found in the following links
-for the different models:
-* [Keen Home Smart Vent Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/205302050-Keen-Home-Smart-Vent)

devicetypes/keen-home/keen-home-smart-vent.src/keen-home-smart-vent.groovy

@@ -11,7 +11,6 @@ metadata {
         capability "Sensor"
         capability "Temperature Measurement"
         capability "Battery"
-        capability "Health Check"
 
         command "getLevel"
         command "getOnOff"
@@ -21,7 +20,10 @@ metadata {
         command "setZigBeeIdTile"
         command "clearObstruction"
 
-        fingerprint endpoint: "1", profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0006,0008,0020,0402,0403,0B05,FC01,FC02", outClusters: "0019"
+        fingerprint endpoint: "1",
+        profileId: "0104",
+        inClusters: "0000,0001,0003,0004,0005,0006,0008,0020,0402,0403,0B05,FC01,FC02",
+        outClusters: "0019"
     }
 
     // simulator metadata
@@ -38,10 +40,10 @@ metadata {
     // UI tile definitions
     tiles {
         standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-            state "on", action: "switch.off", icon: "st.vents.vent-open-text", backgroundColor: "#00a0dc"
+            state "on", action: "switch.off", icon: "st.vents.vent-open-text", backgroundColor: "#53a7c0"
             state "off", action: "switch.on", icon: "st.vents.vent-closed", backgroundColor: "#ffffff"
-            state "obstructed", action: "clearObstruction", icon: "st.vents.vent-closed", backgroundColor: "#e86d13"
-            state "clearing", action: "", icon: "st.vents.vent-closed", backgroundColor: "#ffffff"
+            state "obstructed", action: "clearObstruction", icon: "st.vents.vent-closed", backgroundColor: "#ff0000"
+            state "clearing", action: "", icon: "st.vents.vent-closed", backgroundColor: "#ffff33"
         }
         controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false) {
             state "level", action:"switch level.setLevel"
@@ -464,27 +466,15 @@ def refresh() {
     getBattery()
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-    return refresh()
-}
-
 def configure() {
     log.debug "CONFIGURE"
 
-    // Device-Watch allows 2 check-in misses from device + ping (plus 1 min lag time)
-    // enrolls with default periodic reporting until newer 5 min interval is confirmed
-    sendEvent(name: "checkInterval", value: 2 * 10 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-
     // get ZigBee ID by hidden tile because that's the only way we can do it
     setZigBeeIdTile()
 
     def configCmds = [
         // bind reporting clusters to hub
-            //commenting out switch cluster bind as using wrapper onOffConfig of zigbee class
-        //"zdo bind 0x${device.deviceNetworkId} 1 1 0x0006 {${device.zigbeeId}} {}", "delay 500",
+        "zdo bind 0x${device.deviceNetworkId} 1 1 0x0006 {${device.zigbeeId}} {}", "delay 500",
         "zdo bind 0x${device.deviceNetworkId} 1 1 0x0008 {${device.zigbeeId}} {}", "delay 500",
         "zdo bind 0x${device.deviceNetworkId} 1 1 0x0402 {${device.zigbeeId}} {}", "delay 500",
         "zdo bind 0x${device.deviceNetworkId} 1 1 0x0403 {${device.zigbeeId}} {}", "delay 500",
@@ -520,5 +510,5 @@ def configure() {
         // "send 0x${device.deviceNetworkId} 1 1", "delay 1500",
     ]
 
-    return configCmds + zigbee.onOffConfig() + refresh()
+    return configCmds + refresh()
 }

devicetypes/plaidsystems/spruce-controller.src/spruce-controller.groovy

@@ -1,5 +1,6 @@
 /**
- *  Spruce Controller V2_4 Big Tiles *
+ *  Spruce Controller - Pre Release V2 10/11/2015
+ *
  *  Copyright 2015 Plaid Systems
  *
  *	Author: NC
@@ -20,96 +21,82 @@
  */
 
 metadata {
-	definition (name: 'Spruce Controller', namespace: 'plaidsystems', author: 'Plaid Systems') {
-		capability 'Switch'
-        capability 'Configuration'
-        capability 'Refresh'
-        capability 'Actuator'
-        capability 'Valve'        
+	definition (name: "Spruce Controller", namespace: "plaidsystems", author: "NCauffman") {
+		capability "Switch"
+        capability "Configuration"
+        capability "Refresh"
+        capability "Actuator"
+        capability "Valve"        
 		
-        attribute 'switch', 'string'
-        attribute 'switch1', 'string'
-		attribute 'switch2', 'string'
-		attribute 'switch8', 'string'
-		attribute 'switch5', 'string'
-		attribute 'switch3', 'string'
-		attribute 'switch4', 'string'
-		attribute 'switch6', 'string'
-		attribute 'switch7', 'string'
-        attribute 'switch9', 'string'
-		attribute 'switch10', 'string'
-		attribute 'switch11', 'string'
-		attribute 'switch12', 'string'
-		attribute 'switch13', 'string'
-		attribute 'switch14', 'string'
-		attribute 'switch15', 'string'
-        attribute 'switch16', 'string'
-		attribute 'rainsensor', 'string'
-        attribute 'status', 'string'
-        attribute 'tileMessage', 'string'
-        attribute 'minutes', 'string'
-        attribute 'VALUE_UP', 'string'
-        attribute 'VALUE_DOWN', 'string'        
+        attribute "switch", "string"
+        attribute "switch1", "string"
+		attribute "switch2", "string"
+		attribute "switch8", "string"
+		attribute "switch5", "string"
+		attribute "switch3", "string"
+		attribute "switch4", "string"
+		attribute "switch6", "string"
+		attribute "switch7", "string"
+        attribute "switch9", "string"
+		attribute "switch10", "string"
+		attribute "switch11", "string"
+		attribute "switch12", "string"
+		attribute "switch13", "string"
+		attribute "switch14", "string"
+		attribute "switch15", "string"
+        attribute "switch16", "string"
+		attribute "status", "string"        
         
-        command 'levelUp'
-        command 'levelDown'
-        command 'programOn'
-        command 'programOff'
-        command 'programWait'
-        command 'programEnd'
+        command "programOn"
+        command "programOff"
+        command "on"
+        command "off"
+        command "z1on"
+		command "z1off"
+		command "z2on"
+		command "z2off"        
+		command "z3on"
+		command "z3off"
+		command "z4on"
+		command "z4off"
+		command "z5on"
+		command "z5off"
+		command "z6on"
+		command "z6off"
+		command "z7on"
+		command "z7off"
+		command "z8on"
+		command "z8off"
+        command "z9on"
+        command "z9off"
+		command "z10on"
+		command "z10off"
+		command "z11on"
+		command "z11off"
+		command "z12on"
+		command "z12off"
+		command "z13on"
+		command "z13off"
+		command "z14on"
+		command "z14off"
+		command "z15on"
+		command "z15off"
+		command "z16on"
+		command "z16off"
+        command "offtime"
         
-        command 'on'
-        command 'off'
-        command 'zon'
-        command 'zoff'
-        command 'z1on'
-		command 'z1off'
-		command 'z2on'
-		command 'z2off'        
-		command 'z3on'
-		command 'z3off'
-		command 'z4on'
-		command 'z4off'
-		command 'z5on'
-		command 'z5off'
-		command 'z6on'
-		command 'z6off'
-		command 'z7on'
-		command 'z7off'
-		command 'z8on'
-		command 'z8off'
-        command 'z9on'
-        command 'z9off'
-		command 'z10on'
-		command 'z10off'
-		command 'z11on'
-		command 'z11off'
-		command 'z12on'
-		command 'z12off'
-		command 'z13on'
-		command 'z13off'
-		command 'z14on'
-		command 'z14off'
-		command 'z15on'
-		command 'z15off'
-		command 'z16on'
-		command 'z16off'
+        command "refresh"        
+        command "rain"
+        command "manual"
+        command "setDisplay"
         
-        command 'config'
-        command 'refresh'        
-        command 'rain'
-        command 'manual'
-        command 'manualTime'
-        command 'settingsMap'
-        command 'writeTime'
-        command 'writeType'        
-        command 'notify'
-        command 'updated'      
-        
-		//ST release
-		//fingerprint endpointId: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18', profileId: '0104', deviceId: '0002', deviceVersion: '00', inClusters: '0000,0003,0004,0005,0006,000F', outClusters: '0003, 0019', manufacturer: 'PLAID SYSTEMS', model: 'PS-SPRZ16-01'
-		//new release
-        fingerprint endpointId: "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18", profileId: "0104", deviceId: "0002", deviceVersion: "00", inClusters: "0000,0003,0004,0005,0006,0009,000A,000F", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZ16-01"
+        command "settingsMap"
+        command "writeTime"
+        command "writeType"        
+        command "notify"
+        command "updated"
+
+		fingerprint endpointId: "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18", profileId: "0104", deviceId: "0002", deviceVersion: "00", inClusters: "0000,0003,0004,0005,0006,000F", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZ16-01"
 		
 	}
 
@@ -117,230 +104,162 @@ metadata {
 	simulator {
 		// status messages
 		
-		// reply messages		
+		// reply messages
+		
 	}
-    
     preferences {
-    input description: 'If you have a rain sensor wired to the rain sensor input on the Spruce controller, turn it on here.', displayDuringSetup: true, type: 'paragraph', element: 'paragraph', title: 'Rain Sensor'
-    input description: 'The SYNC SETTINGS button must be pressed after making a change to the Rain sensor:', displayDuringSetup: false, type: 'paragraph', element: 'paragraph', title: ''     
-    input 'RainEnable', 'bool', title: 'Rain Sensor Attached?', required: false, displayDuringSetup: true
-    input description: 'Adjust manual water time with arrows on main tile.  The time indicated in the first small tile indicates the time the zone will water when manually switched on.', displayDuringSetup: false, type: 'paragraph', element: 'paragraph', title: ''
-    }
+    input description: "Press Configure button after making changes to these preferences", displayDuringSetup: true, type: "paragraph", element: "paragraph", title: ""
+    input "RainEnable", "bool", title: "Rain Sensor Attached?", required: false, displayDuringSetup: true
+    input "ManualTime", "number", title: "Automatic shutoff time when a zone is turned on manually?", required: false, displayDuringSetup: true
+	}
 
 	// UI tile definitions
 	tiles {
     
-    	multiAttributeTile(name:"switchall", type:"generic", width:6, height:4) {        
-            tileAttribute('device.status', key: 'PRIMARY_CONTROL') {
-            attributeState 'schedule', label: 'Ready', icon: 'http://www.plaidsystems.com/smartthings/st_spruce_leaf_225_top.png'
-            attributeState 'finished', label: 'Finished', icon: 'st.Outdoor.outdoor5', backgroundColor: '#46c2e8'
-            attributeState 'raintoday', label: 'Rain Today', icon: 'http://www.plaidsystems.com/smartthings/st_rain.png', backgroundColor: '#d65fe3'
-            attributeState 'rainy', label: 'Rain', icon: 'http://www.plaidsystems.com/smartthings/st_rain.png', backgroundColor: '#d65fe3'
-            attributeState 'raintom', label: 'Rain Tomorrow', icon: 'http://www.plaidsystems.com/smartthings/st_rain.png', backgroundColor: '#d65fe3'
-            attributeState 'donewweek', label: 'Finished', icon: 'st.Outdoor.outdoor5', backgroundColor: '#00A0DC'
-            attributeState 'skipping', label: 'Skip', icon: 'st.Outdoor.outdoor20', backgroundColor: '#46c2e8'
-            attributeState 'moisture', label: 'Ready', icon: 'st.Weather.weather2', backgroundColor: '#46c2e8'
-            attributeState 'pause', label: 'PAUSE', icon: 'st.contact.contact.open', backgroundColor: '#e86d13'
-			attributeState 'delayed', label: 'Delayed', icon: 'st.contact.contact.open', backgroundColor: '#e86d13'
-            attributeState 'active', label: 'Active', icon: 'st.Outdoor.outdoor12', backgroundColor: '#3DC72E'
-            attributeState 'season', label: 'Adjust', icon: 'st.Outdoor.outdoor17', backgroundColor: '#ffb900'
-            attributeState 'disable', label: 'Off', icon: 'st.secondary.off', backgroundColor: '#cccccc'
-            attributeState 'warning', label: 'Warning', icon: 'http://www.plaidsystems.com/smartthings/st_spruce_leaf_225_top_yellow.png'
-            attributeState 'alarm', label: 'Alarm', icon: 'http://www.plaidsystems.com/smartthings/st_spruce_leaf_225_s_red.png', backgroundColor: '#e66565'
-            }
-            
-            tileAttribute("device.minutes", key: "VALUE_CONTROL") {
-                attributeState "VALUE_UP", action: "levelUp"
-                attributeState "VALUE_DOWN", action: "levelDown"
-            }
-            
-            tileAttribute("device.tileMessage", key: "SECONDARY_CONTROL") {
-                attributeState "tileMessage", label: '${currentValue}'     
-            }            
-            
+    	standardTile("status", "device.status") {            
+            state "schedule", label: 'Schedule Set', icon: "http://www.plaidsystems.com/smartthings/st_spruce_leaf_225_t.png"
+            state "finished", label: 'Spruce Finished', icon: "st.Outdoor.outdoor5", backgroundColor: "#46c2e8"
+            state "raintoday", label: 'Rain Today', icon: "st.custom.wuk.nt_chancerain"
+            state "rainy", label: 'Previous Rain', icon: "st.custom.wuk.nt_chancerain"
+            state "raintom", label: 'Rain Tomorrow', icon: "st.custom.wuk.nt_chancerain"           
+            state "donewweek", label: 'Spruce Finished', icon: "st.Outdoor.outdoor5", backgroundColor: "#52c435"
+            state "skipping", label: 'Skip Today', icon: "st.Outdoor.outdoor20", backgroundColor: "#36cfe3"
+            state "moisture", label: '', icon: "st.Weather.weather2", backgroundColor: "#36cfe3"
+            state "pause", label: 'PAUSE', icon: "st.contact.contact.open", backgroundColor: "#f2a51f"           
+            state "active", label: 'Active', icon: "st.Outdoor.outdoor12", backgroundColor: "#3DC72E"
+            state "season", label: 'Seasonal Adjustment', icon: "st.Outdoor.outdoor17", backgroundColor: "#ffb900"
+            state "disable", label: 'Disabled', icon: "st.secondary.off", backgroundColor: "#888888"
+            state "warning", label: '', icon: "st.categories.damageAndDanger", backgroundColor: "#ffff7f"
+            state "alarm", label: 'Alarm', icon: "st.categories.damageAndDanger", backgroundColor: "#f9240c"
         }
-        valueTile('minutes', 'device.minutes'){
-        	state 'minutes', label: '${currentValue} min'
-        }
-        valueTile('dummy', 'device.minutes'){
-        	state 'minutes', label: ''
-        }
-		standardTile('switch', 'device.switch', width:2, height:2) {
-            state 'off', label: 'Start', action: 'programOn', icon: 'st.Outdoor.outdoor12', backgroundColor: '#a9a9a9'
-            state 'programOn', label: 'Wait', action: 'programOff', icon: 'st.contact.contact.open', backgroundColor: '#f6e10e'
-            state 'programWait', label: 'Wait', action: 'programEnd', icon: 'st.contact.contact.open', backgroundColor: '#f6e10e'
-            state 'on', label: 'Running', action: 'programEnd', icon: 'st.Outdoor.outdoor12', backgroundColor: '#3DC72E'
+		standardTile("switch", "device.switch") {			
+			//state "programOff", label: 'Start Program', action: "programOn", icon: "st.sonos.play-icon", backgroundColor: "#a9a9a9"
+            state "off", label: 'Start Program', action: "programOn", icon: "st.sonos.play-icon", backgroundColor: "#a9a9a9"
+            state "programOn", label: 'Initialize Program', action: "programOff", icon: "st.contact.contact.open", backgroundColor: "#f6e10e"            
+            state "on", label: 'Program Running', action: "off", icon: "st.Outdoor.outdoor12", backgroundColor: "#3DC72E"
+		}
+        standardTile("rainsensor", "device.rainsensor") {			
+			state "rainSensrooff", label: 'Rain Sensor Clear', icon: "st.Weather.weather14", backgroundColor: "#a9a9a9"
+            state "rainSensoron", label: 'Rain Detected', icon: "st.Weather.weather10", backgroundColor: "#f6e10e"
+		}    	
+        standardTile("switch1", "device.switch1") {			
+			state "z1off", label: '1', action: "z1on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z1on", label: '1', action: "z1off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch2", "device.switch2") {            
+            state "z2off", label: '2', action: "z2on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z2on", label: '2', action: "z2off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}        
-        standardTile("rainsensor", "device.rainsensor", decoration: 'flat') {			
-			state "rainSensoroff", label: 'sensor', icon: 'http://www.plaidsystems.com/smartthings/st_drop_on.png'
-            state "rainSensoron", label: 'sensor', icon: 'http://www.plaidsystems.com/smartthings/st_drop_on_blue_small.png'
-            state "disable", label: 'sensor', icon: 'http://www.plaidsystems.com/smartthings/st_drop_x_small.png'
-            state "enable", label: 'sensor', icon: 'http://www.plaidsystems.com/smartthings/st_drop_on.png'
+        standardTile("switch3", "device.switch3", inactiveLabel: false) {			
+			state "z3off", label: '3', action: "z3on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z3on", label: '3', action: "z3off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
-        standardTile('switch1', 'device.switch1', inactiveLabel: false) {			
-			state 'z1off', label: '1', action: 'z1on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z1on', label: '1', action: 'z1off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
+        standardTile("switch4", "device.switch4", inactiveLabel: false) {            
+            state "z4off", label: '4', action: "z4on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z4on", label: '4', action: "z4off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
-        standardTile('switch2', 'device.switch2', inactiveLabel: false) {            
-            state 'z2off', label: '2', action: 'z2on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z2on', label: '2', action: 'z2off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
+        standardTile("switch5", "device.switch5", inactiveLabel: false) {            
+            state "z5off", label: '5', action: "z5on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z5on", label: '5', action: "z5off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+		standardTile("switch6", "device.switch6", inactiveLabel: false) {            
+            state "z6off", label: '6', action: "z6on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z6on", label: '6', action: "z6off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch7", "device.switch7", inactiveLabel: false) {            
+            state "z7off", label: '7', action: "z7on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z7on", label: '7', action: "z7off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+		standardTile("switch8", "device.switch8", inactiveLabel: false) {            
+            state "z8off", label: '8', action: "z8on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z8on", label: '8', action: "z8off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch9", "device.switch9", inactiveLabel: false) {			
+			state "z9off", label: '9', action: "z9on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z9on", label: '9', action: "z9off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch10", "device.switch10", inactiveLabel: false) {            
+            state "z10off", label: '10', action: "z10on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z10on", label: '10', action: "z10off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}        
-        standardTile('switch3', 'device.switch3', inactiveLabel: false) {			
-			state 'z3off', label: '3', action: 'z3on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z3on', label: '3', action: 'z3off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
+        standardTile("switch11", "device.switch11", inactiveLabel: false) {			
+			state "z11off", label: '11', action: "z11on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z11on", label: '11', action: "z11off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
-        standardTile('switch4', 'device.switch4', inactiveLabel: false) {            
-            state 'z4off', label: '4', action: 'z4on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z4on', label: '4', action: 'z4off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
+        standardTile("switch12", "device.switch12", inactiveLabel: false) {            
+            state "z12off", label: '12', action: "z12on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z12on", label: '12', action: "z12off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
-        standardTile('switch5', 'device.switch5', inactiveLabel: false) {            
-            state 'z5off', label: '5', action: 'z5on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z5on', label: '5', action: 'z5off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
+        standardTile("switch13", "device.switch13", inactiveLabel: false) {            
+            state "z13off", label: '13', action: "z13on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z13on", label: '13', action: "z13off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
-		standardTile('switch6', 'device.switch6', inactiveLabel: false) {            
-            state 'z6off', label: '6', action: 'z6on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z6on', label: '6', action: 'z6off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
+		standardTile("switch14", "device.switch14", inactiveLabel: false) {            
+            state "z14off", label: '14', action: "z14on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z14on", label: '14', action: "z14off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
-        standardTile('switch7', 'device.switch7', inactiveLabel: false) {            
-            state 'z7off', label: '7', action: 'z7on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z7on', label: '7', action: 'z7off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
-		}
-		standardTile('switch8', 'device.switch8', inactiveLabel: false) {            
-            state 'z8off', label: '8', action: 'z8on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z8on', label: '8', action: 'z8off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
-		}
-        standardTile('switch9', 'device.switch9', inactiveLabel: false) {			
-			state 'z9off', label: '9', action: 'z9on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z9on', label: '9', action: 'z9off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
-		}
-        standardTile('switch10', 'device.switch10', inactiveLabel: false) {            
-            state 'z10off', label: '10', action: 'z10on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z10on', label: '10', action: 'z10off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
-		}        
-        standardTile('switch11', 'device.switch11', inactiveLabel: false) {			
-			state 'z11off', label: '11', action: 'z11on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z11on', label: '11', action: 'z11off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
-		}
-        standardTile('switch12', 'device.switch12', inactiveLabel: false) {            
-            state 'z12off', label: '12', action: 'z12on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z12on', label: '12', action: 'z12off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
-		}
-        standardTile('switch13', 'device.switch13', inactiveLabel: false) {            
-            state 'z13off', label: '13', action: 'z13on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z13on', label: '13', action: 'z13off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
-		}
-		standardTile('switch14', 'device.switch14', inactiveLabel: false) {            
-            state 'z14off', label: '14', action: 'z14on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z14on', label: '14', action: 'z14off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
-		}
-        standardTile('switch15', 'device.switch15', inactiveLabel: false) {            
-            state 'z15off', label: '15', action: 'z15on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z15on', label: '15', action: 'z15off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
+        standardTile("switch15", "device.switch15", inactiveLabel: false) {            
+            state "z15off", label: '15', action: "z15on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z15on", label: '15', action: "z15off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}		
-        standardTile('switch16', 'device.switch16', inactiveLabel: false) {            
-            state 'z16off',  label: '16', action: 'z16on', icon: 'st.valves.water.closed', backgroundColor: '#ffffff'
-            state 'z16on',  label: '16', action: 'z16off', icon: 'st.valves.water.open', backgroundColor: '#00A0DC'
+        standardTile("switch16", "device.switch16", inactiveLabel: false) {            
+            state "z16off", label: '16', action: "z16on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z16on", label: '16', action: "z16off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}        
-        standardTile('refresh', 'device.switch', inactiveLabel: false, decoration: 'flat') {
-			state 'default', action: 'refresh', icon:'st.secondary.refresh'//-icon'            
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+			state "default", action: "refresh", icon:"st.secondary.refresh"            
 		}
-        standardTile('configure', 'device.configure', inactiveLabel: false, decoration: 'flat') {
-			state 'configure', label:'', action:'configuration.configure', icon:'http://www.plaidsystems.com/smartthings/st_syncsettings.png'//sync_icon_small.png'
-		}        
+        standardTile("configure", "device.configure", inactiveLabel: false, decoration: "flat") {
+			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
+		}		
 		
-        main (['switchall'])        
-        details(['switchall','minutes','rainsensor','switch1','switch2','switch3','switch4','switch','switch5','switch6','switch7','switch8','switch9','switch10','switch11','switch12','refresh','configure','switch13','switch14','switch15','switch16'])		
-    }       
+        main (["status"])        
+        details(["status","rainsensor","switch","switch1","switch2","switch3","switch4","switch5","switch6","switch7","switch8","switch9","switch10","switch11","switch12","switch13","switch14","switch15","switch16","refresh","configure"])		
+    }    
 }
 
-//used for schedule 
 def programOn(){
-    sendEvent(name: 'switch', value: 'programOn', descriptionText: 'Program turned on')    
-    }
-
-def programWait(){    
-    sendEvent(name: 'switch', value: 'programWait', descriptionText: "Initializing Schedule")
-    }
-
-def programEnd(){
-	//sets switch to off and tells schedule switch is off/schedule complete with manaual
-    sendEvent(name: 'switch', value: 'off', descriptionText: 'Program manually turned off')
-    zoff() 
+    sendEvent(name: "switch", value: "programOn", descriptionText: "Program turned on")    
     }
     
 def programOff(){    
-    sendEvent(name: 'switch', value: 'off', descriptionText: 'Program turned off')
+    sendEvent(name: "switch", value: "off", descriptionText: "Program turned off")
     off()
     }
-
-//set minutes
-def levelUp(){
-	def newvalue = 1
-    if (device.latestValue('minutes') != null) newvalue = device.latestValue('minutes').toInteger()+1
-    if (newvalue >= 60) newvalue = 60
-    def value = newvalue.toString()    
-    log.debug value
-	sendEvent(name: 'minutes', value: "${value}", descriptionText: "Manual Time set to ${value}", display: false)    
-}
-
-def levelDown(){
-	def newvalue = device.latestValue('minutes').toInteger()-1
-    if (newvalue <= 0) newvalue = 1
-    def value = newvalue.toString()    
-    log.debug value
-	sendEvent(name: 'minutes', value: "${value}", descriptionText: "Manual Time set to ${value}", display: false)
+    
+def updated(){
+	log.debug "updated"    
 }
 
 // Parse incoming device messages to generate events
 def parse(String description) {	
-	log.debug "Parse description ${description}"
+	//log.debug "Parse description $description"
     def result = null
     def map = [:]
-	if (description?.startsWith('read attr -')) {
+	if (description?.startsWith("read attr -")) {
 		def descMap = parseDescriptionAsMap(description)
 		//log.debug "Desc Map: $descMap"
         //using 000F cluster instead of 0006 (switch) because ST does not differentiate between EPs and processes all as switch
-		if (descMap.cluster == '000F' && descMap.attrId == '0055') {
-			log.debug 'Zone'
+		if (descMap.cluster == "000F" && descMap.attrId == "0055") {
+			log.debug "Zone"
             map = getZone(descMap)            
 		}
-        else if (descMap.cluster == '0009' && descMap.attrId == '0000') {
-			log.debug 'Alarm'
+        else if (descMap.cluster == "0009" && descMap.attrId == "0000") {
+			log.debug "Alarm"            
             map = getAlarm(descMap)
             }
+	}     
+	
+	if (map) {
+		result = createEvent(map)
 	}
-    else if (description?.startsWith('catchall: 0104 0009')){
-    	log.debug 'Sync settings to controller complete'
-        if (device.latestValue('status') != 'alarm'){
-        	def configEvt = createEvent(name: 'status', value: 'schedule', descriptionText: "Sync settings to controller complete")
-            def configMsg = createEvent(name: 'tileMessage', value: 'Sync settings to controller complete', descriptionText: "Sync settings to controller complete", displayed: false)
-        	result = [configEvt, configMsg]
-            }
-        return result
-    }
-  
-    if (map) {
-    	result = createEvent(map)
-    	//configure after reboot
-        if (map.value == 'warning' || map.value == 'alarm'){
-            def cmds = config()       
-            def alarmEvt = createEvent(name: 'tileMessage', value: map.descriptionText, descriptionText: "${map.descriptionText}", displayed: false)
-            result = cmds?.collect { new physicalgraph.device.HubAction(it) } + createEvent(map) + alarmEvt           
-			return result
-		}
-        else if (map.name == 'rainsensor'){
-        	def rainEvt = createEvent(name: 'tileMessage', value: map.descriptionText, descriptionText: "${map.descriptionText}", displayed: false)
-        	result = [createEvent(map), rainEvt]
-            return result
-        }
-	}
-	if (map) log.debug "Parse returned ${map} ${result}"
+	log.debug "Parse returned $map $result"
 	return result
 }
 
 def parseDescriptionAsMap(description) {
-	(description - 'read attr - ').split(',').inject([:]) { map, param ->
-		def nameAndValue = param.split(':')
+	(description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
 		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
 	}
 }
@@ -351,28 +270,27 @@ def getZone(descMap){
     def EP = Integer.parseInt(descMap.endpoint.trim(), 16)
     
     String onoff
-    if(descMap.value == '00'){
-    	onoff = 'off'        
+    if(descMap.value == "00"){
+    	onoff = "off"        
     }    
-    else onoff = 'on'
+    else onoff = "on"
             
     if (EP == 1){
-    	map.name = 'switch'
+    	map.name = "switch"
         map.value = onoff
-        map.descriptionText = "${device.displayName} turned sprinkler program ${onoff}"
+        map.descriptionText = "${device.displayName} turned sprinkler program $onoff"
         }
         
     else if (EP == 18) {
-        map.name = 'rainsensor'
-    	log.debug "Rain enable: ${RainEnable}, sensor: ${onoff}"
-        map.value = 'rainSensor' + onoff
-        map.descriptionText = "${device.displayName} rain sensor is ${onoff}"
+        map.name = "rainsensor"
+    	map.value = "rainSensor" + onoff
+        map.descriptionText = "${device.displayName} rain sensor is $onoff"
         }
    	else {
         EP -= 1
-        map.name = 'switch' + EP
-    	map.value = 'z' + EP + onoff
-    	map.descriptionText = "${device.displayName} turned Zone $EP ${onoff}"
+        map.name = "switch" + EP
+    	map.value = "z" + EP + onoff
+    	map.descriptionText = "${device.displayName} turned Zone $EP $onoff"
     	}
         
     map.isStateChange = true 
@@ -382,59 +300,37 @@ def getZone(descMap){
 
 def getAlarm(descMap){
 	def map = [:]
-    map.name = 'status'
+    map.name = "status"
     def alarmID = Integer.parseInt(descMap.value.trim(), 16)
     log.debug "${alarmID}"
-    map.value = 'alarm'
-    map.displayed = true
+    if(alarmID <= 0) map.descriptionText = "${device.displayName} has rebooted, no other alarms"
+    else map.descriptionText = "${device.displayName} rebooted, reported error on zone ${alarmID - 1}, please check zone is working correctly"    
+	map.value = "alarm"
     map.isStateChange = true
-    if(alarmID <= 0){
-    	map.descriptionText = "${device.displayName} reboot, no other alarms"
-        map.value = 'warning'
-        //map.isStateChange = false
-        }
-    else map.descriptionText = "${device.displayName} reboot, reported zone ${alarmID - 1} error, please check zone is working correctly, press SYNC SETTINGS button to clear"
-       
+    map.displayed = true
     return map        
 }
 
 //status notify and change status
-def notify(String val, String txt){
-	sendEvent(name: 'status', value: val, descriptionText: txt, isStateChange: true, display: false)
-    
-    //String txtShort = txt.take(100)
-    sendEvent(name: 'tileMessage', value: txt, descriptionText: "", isStateChange: true, display: false)
-}
+def notify(value, text){	
+	sendEvent(name:"status", value:"$value", descriptionText:"$text", isStateChange: true, display: false)
 
-def updated(){
-	log.debug "updated"
-    
 }
 
 //prefrences - rain sensor, manual time
 def rain() {
-    log.debug "Rain sensor: ${RainEnable}"
-    if (RainEnable) sendEvent(name: 'rainsensor', value: 'enable', descriptionText: "${device.displayName} rain sensor is enabled", isStateChange: true)
-    else sendEvent(name: 'rainsensor', value: 'disable', descriptionText: "${device.displayName} rain sensor is disabled", isStateChange: true)
-    
+    log.debug "Rain $RainEnable"
     if (RainEnable) "st wattr 0x${device.deviceNetworkId} 18 0x0F 0x51 0x10 {01}"
     else "st wattr 0x${device.deviceNetworkId} 18 0x0F 0x51 0x10 {00}"
 }
-
-def manualTime(value){	
-	sendEvent(name: 'minutes', value: "${value}", descriptionText: "Manual Time set to ${value}", display: false)
-}
-
-def manual(){    
-    def newManaul = 10    
-    if (device.latestValue('minutes')) newManaul = device.latestValue('minutes').toInteger()    
-    log.debug "Manual Zone runtime ${newManaul} mins"    
-    def manualTime = hex(newManaul)  
+def manual(){
+	log.debug "Time $ManualTime"
+    def mTime = 10
+    if (ManualTime) mTime = ManualTime
+    def manualTime = hex(mTime)
+    "st wattr 0x${device.deviceNetworkId} 1 6 0x4002 0x21 {00${manualTime}}"
     
-    def sendCmds = []
-    sendCmds.push("st wattr 0x${device.deviceNetworkId} 1 6 0x4002 0x21 {00${manualTime}}")
-    return sendCmds
-}
+    }
 
 //write switch time settings map
 def settingsMap(WriteTimes, attrType){
@@ -470,20 +366,13 @@ def writeTime(wEP, runTime){
 
 //set reporting and binding
 def configure() {
-	
-    sendEvent(name: 'status', value: 'schedule', descriptionText: "Syncing settings to controller")
-    sendEvent(name: 'minutes', value: "10", descriptionText: "Manual Time set to 10 mins", display: false)
-    sendEvent(name: 'tileMessage', value: 'Syncing settings to controller', descriptionText: 'Syncing settings to controller')
-    config()    
-}
-
-def config(){
 
 	String zigbeeId = swapEndianHex(device.hub.zigbeeId)
-	log.debug "Configuring Reporting and Bindings ${device.deviceNetworkId} ${device.zigbeeId}"
+	log.debug "Confuguring Reporting and Bindings ${device.deviceNetworkId} ${device.zigbeeId}"
+	sendEvent(name: 'configuration',value: 100, descriptionText: "Configuration initialized")
     
     def configCmds = [	
-        //program on/off        
+        //program on/off
         "zdo bind 0x${device.deviceNetworkId} 1 1 6 {${device.zigbeeId}} {}", "delay 1000",
         "zdo bind 0x${device.deviceNetworkId} 1 1 0x09 {${device.zigbeeId}} {}", "delay 1000",        
         "zdo bind 0x${device.deviceNetworkId} 1 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
@@ -569,16 +458,38 @@ def config(){
         "zcl global send-me-a-report 0x09 0x00 0x21 1 0 {00}", "delay 500",
         "send 0x${device.deviceNetworkId} 1 1", "delay 500"
 	]
-    return configCmds + rain()
+    return configCmds + rain() + manual()
 }
 
+
+
+private hex(value) {
+	new BigInteger(Math.round(value).toString()).toString(16)
+}
+
+private String swapEndianHex(String hex) {
+    reverseArray(hex.decodeHex()).encodeHex()
+}
+
+private byte[] reverseArray(byte[] array) {
+    int i = 0;
+    int j = array.length - 1;
+    byte tmp;
+    while (j > i) {
+        tmp = array[j];
+        array[j] = array[i];
+        array[i] = tmp;
+        j--;
+        i++;
+    }
+    return array
+}    
+
 def refresh() {
 
-	log.debug "refresh pressed"
-    sendEvent(name: 'tileMessage', value: 'Refresh', descriptionText: 'Refresh')
-        
-    def refreshCmds = [	    
-        
+	log.debug "refresh"
+    def refreshCmds = [
+	        
         "st rattr 0x${device.deviceNetworkId} 1 0x0F 0x55", "delay 500",
         
         "st rattr 0x${device.deviceNetworkId} 2 0x0F 0x55", "delay 500",
@@ -602,96 +513,64 @@ def refresh() {
         "st rattr 0x${device.deviceNetworkId} 18 0x0F 0x51","delay 500",
  	
     ]
-    
-    return refreshCmds
-}
-
-private hex(value) {
-	new BigInteger(Math.round(value).toString()).toString(16)
-}
-
-private String swapEndianHex(String hex) {
-    reverseArray(hex.decodeHex()).encodeHex()
-}
-
-private byte[] reverseArray(byte[] array) {
-    int i = 0;
-    int j = array.length - 1;
-    byte tmp;
-    while (j > i) {
-        tmp = array[j];
-        array[j] = array[i];
-        array[i] = tmp;
-        j--;
-        i++;
-    }
-    return array
-}
-
-//on & off redefined for Alexa to start manual schedule
-def on() {    
-    log.debug 'Alexa on'
-    //schedule subscribes to programOn
-    sendEvent(name: 'switch', value: 'programOn', descriptionText: 'Alexa turned program on')           
-}
-def off() {
-	log.debug 'Alexa off'
-    sendEvent(name: 'switch', value: 'off', descriptionText: 'Alexa turned program off')
-    zoff()        
+    return refreshCmds + rain() + manual()
 }
 
 // Commands to device
 //zones on - 8
-def zon() {
-	"st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
+def on() {
+    //sendEvent(name:"status", value:"active", descriptionText:"Program Running", isStateChange: true, display: false)
+    log.debug "on"
+    "st cmd 0x${device.deviceNetworkId} 1 6 1 {}"    
 }
-def zoff() {
-	"st cmd 0x${device.deviceNetworkId} 1 6 0 {}" 
+def off() {
+    log.debug "off"
+    "st cmd 0x${device.deviceNetworkId} 1 6 0 {}"    
 }
 def z1on() {	
-    return manual() + "st cmd 0x${device.deviceNetworkId} 2 6 1 {}"    
+    "st cmd 0x${device.deviceNetworkId} 2 6 1 {}"
 }
 def z1off() {    
     "st cmd 0x${device.deviceNetworkId} 2 6 0 {}"
 }
 def z2on() {	
-    return manual() + "st cmd 0x${device.deviceNetworkId} 3 6 1 {}"    
+    "st cmd 0x${device.deviceNetworkId} 3 6 1 {}"    
 }
 def z2off() {    
     "st cmd 0x${device.deviceNetworkId} 3 6 0 {}"    
 }
 def z3on() {        
-    return manual() + "st cmd 0x${device.deviceNetworkId} 4 6 1 {}"    
+    "st cmd 0x${device.deviceNetworkId} 4 6 1 {}"    
 }
 def z3off() {	
     "st cmd 0x${device.deviceNetworkId} 4 6 0 {}"    
 }
 def z4on() {	
-    return manual() + "st cmd 0x${device.deviceNetworkId} 5 6 1 {}"    
+    "st cmd 0x${device.deviceNetworkId} 5 6 1 {}"    
 }
 def z4off() {    
     "st cmd 0x${device.deviceNetworkId} 5 6 0 {}"    
 }
 def z5on() {	
-	return manual() + "st cmd 0x${device.deviceNetworkId} 6 6 1 {}"   
+	"st cmd 0x${device.deviceNetworkId} 6 6 1 {}"   
 }
 def z5off() {
 	"st cmd 0x${device.deviceNetworkId} 6 6 0 {}"    
 }
 def z6on() {
-	return manual() + "st cmd 0x${device.deviceNetworkId} 7 6 1 {}"
+	"st cmd 0x${device.deviceNetworkId} 7 6 1 {}"
 }
 def z6off() {
     "st cmd 0x${device.deviceNetworkId} 7 6 0 {}"
 }
 def z7on() {
-	return manual() + "st cmd 0x${device.deviceNetworkId} 8 6 1 {}"  
+	"st cmd 0x${device.deviceNetworkId} 8 6 1 {}"  
 }
 def z7off() {
 	"st cmd 0x${device.deviceNetworkId} 8 6 0 {}"    
 }
 def z8on() {
-	return manual() + "st cmd 0x${device.deviceNetworkId} 9 6 1 {}"    
+	"st cmd 0x${device.deviceNetworkId} 9 6 1 {}"    
 }
 def z8off() {
 	"st cmd 0x${device.deviceNetworkId} 9 6 0 {}"    
@@ -699,51 +578,50 @@ def z8off() {
 
 //zones 9 - 16
 def z9on() {	
-    return manual() + "st cmd 0x${device.deviceNetworkId} 10 6 1 {}"    
+    "st cmd 0x${device.deviceNetworkId} 10 6 1 {}"    
 }
 def z9off() {	    
     "st cmd 0x${device.deviceNetworkId} 10 6 0 {}"   
 }
 def z10on() {	
-    return manual() + "st cmd 0x${device.deviceNetworkId} 11 6 1 {}"    
+    "st cmd 0x${device.deviceNetworkId} 11 6 1 {}"    
 }
 def z10off() {    
     "st cmd 0x${device.deviceNetworkId} 11 6 0 {}"    
 }
 def z11on() {        
-    return manual() + "st cmd 0x${device.deviceNetworkId} 12 6 1 {}"    
+    "st cmd 0x${device.deviceNetworkId} 12 6 1 {}"    
 }
 def z11off() {	
     "st cmd 0x${device.deviceNetworkId} 12 6 0 {}"    
 }
 def z12on() {	
-    return manual() + "st cmd 0x${device.deviceNetworkId} 13 6 1 {}"    
+    "st cmd 0x${device.deviceNetworkId} 13 6 1 {}"    
 }
 def z12off() {    
     "st cmd 0x${device.deviceNetworkId} 13 6 0 {}"    
 }
 def z13on() {	
-	return manual() + "st cmd 0x${device.deviceNetworkId} 14 6 1 {}"   
+	"st cmd 0x${device.deviceNetworkId} 14 6 1 {}"   
 }
 def z13off() {
 	"st cmd 0x${device.deviceNetworkId} 14 6 0 {}"    
 }
 def z14on() {
-	return manual() + "st cmd 0x${device.deviceNetworkId} 15 6 1 {}"
+	"st cmd 0x${device.deviceNetworkId} 15 6 1 {}"
 }
 def z14off() {
     "st cmd 0x${device.deviceNetworkId} 15 6 0 {}"
 }
 def z15on() {
-	return manual() + "st cmd 0x${device.deviceNetworkId} 16 6 1 {}"  
+	"st cmd 0x${device.deviceNetworkId} 16 6 1 {}"  
 }
 def z15off() {
 	"st cmd 0x${device.deviceNetworkId} 16 6 0 {}"    
 }
 def z16on() {
-	return manual() + "st cmd 0x${device.deviceNetworkId} 17 6 1 {}"    
+	"st cmd 0x${device.deviceNetworkId} 17 6 1 {}"    
 }
 def z16off() {
 	"st cmd 0x${device.deviceNetworkId} 17 6 0 {}"    
-}
-
+}

devicetypes/roomieremote-agent/simple-sync.src/simple-sync.groovy

@@ -22,7 +22,7 @@ metadata
     {
 		standardTile("mainTile", "device.status", width: 1, height: 1, icon: "st.Entertainment.entertainment11")
         {
-        	state "default", label: "Simple Sync", icon: "st.Home.home2", backgroundColor: "#00a0dc"
+        	state "default", label: "Simple Sync", icon: "st.Home.home2", backgroundColor: "#55A7FF"
 		}
         
     	def detailTiles = ["mainTile"]

devicetypes/smartthings/aeon-illuminator-module.src/aeon-illuminator-module.groovy

@@ -47,9 +47,9 @@ metadata {
 
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#00A0DC"
+			state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#79b821"
 			state "turningOff", label:'${name}', icon:"st.switches.switch.off", backgroundColor:"#ffffff"
 		}
 		controlTile("levelSliderControl", "device.level", "slider", height: 2, width: 1, inactiveLabel: false) {

devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy

@@ -37,14 +37,14 @@ metadata {
 	tiles {
 		standardTile("button", "device.button", width: 2, height: 2) {
 			state "default", label: "", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffffff"
-			state "button 1 pushed", label: "pushed #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC"
-			state "button 2 pushed", label: "pushed #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC"
-			state "button 3 pushed", label: "pushed #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC"
-			state "button 4 pushed", label: "pushed #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC"
-			state "button 1 held", label: "held #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13"
-			state "button 2 held", label: "held #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13"
-			state "button 3 held", label: "held #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13"
-			state "button 4 held", label: "held #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13"
+			state "button 1 pushed", label: "pushed #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821"
+			state "button 2 pushed", label: "pushed #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821"
+			state "button 3 pushed", label: "pushed #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821"
+			state "button 4 pushed", label: "pushed #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821"
+			state "button 1 held", label: "held #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e"
+			state "button 2 held", label: "held #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e"
+			state "button 3 held", label: "held #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e"
+			state "button 4 held", label: "held #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e"
 		}
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat") {
 			state "battery", label:'${currentValue}% battery', unit:""

devicetypes/smartthings/aeon-led-bulb.src/aeon-led-bulb.groovy

@@ -37,9 +37,9 @@ metadata {
 	}
 
 	standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-		state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff"
+		state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 		state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-		state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff"
+		state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 		state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 	}
 	standardTile("reset", "device.reset", inactiveLabel: false, decoration: "flat") {

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

@@ -82,8 +82,8 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"motion", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.motion", key: "PRIMARY_CONTROL") {
-				attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC"
-				attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc"
+				attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
+				attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
 			}
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {

devicetypes/smartthings/aeon-multisensor-gen5.src/.st-ignore

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

devicetypes/smartthings/aeon-multisensor-gen5.src/README.md

@@ -1,43 +0,0 @@
-# Aeon Multisensor Gen5
-
-Cloud Execution
-
-Works with: 
-
-* [Aeon Labs MultiSensor (Gen 5)](https://www.smartthings.com/works-with-smartthings/sensors/aeon-labs-multisensor-gen-5)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Troubleshooting](#troubleshooting)
-
-## Capabilities
-
-* **Motion Sensor** - can detect motion
-* **Temperature Measurement** - defines device measures current temperature
-* **Relative Humidity Measurement** - allow reading the relative humidity from devices that support it
-* **Illuminance Measurement** - gives the illuminance reading from devices that support it
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Sensor** - detects sensor events
-* **Battery** - defines device uses a battery
-* **Health Check** - indicates ability to get device health notifications
-
-
-## Device Health
-
-Aeon Labs MultiSensor (Gen 5) 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:
-* [Aeon Labs MultiSensor (Gen 5) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206157226-Aeon-Labs-MultiSensor-Gen-5-)

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

@@ -20,12 +20,10 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
 
 		command "configureAfterSecure"
 
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x98,0x7A", outClusters:"0x5A"
-		fingerprint mfr:"0086", prod:"0102", model:"004A", deviceJoinName: "Aeon Labs MultiSensor (Gen 5)"
 	}
 
 	simulator {
@@ -66,8 +64,8 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"motion", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.motion", key: "PRIMARY_CONTROL") {
-				attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00a0dc"
-				attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc"
+				attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
+				attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
 			}
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
@@ -100,11 +98,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 parse(String description)
 {
 	def result = null
@@ -251,13 +244,6 @@ def configureAfterSecure() {
     secureSequence(request) + ["delay 20000", zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	secure(zwave.batteryV1.batteryGet())
-}
-
 def configure() {
 	// log.debug "configure()"
     //["delay 30000"] + secure(zwave.securityV1.securityCommandsSupportedGet())

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

@@ -59,8 +59,8 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"motion", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.motion", key: "PRIMARY_CONTROL") {
-				attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00a0dc"
-				attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc"
+				attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
+				attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
 			}
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {

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

@@ -45,7 +45,7 @@ metadata {
 	// tile definitions
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00a0dc"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 		}
 		valueTile("energy", "device.energy", decoration: "flat") {

devicetypes/smartthings/aeon-secure-smart-energy-switch-uk.src/aeon-secure-smart-energy-switch-uk.groovy

@@ -53,7 +53,7 @@ metadata {
 	// tile definitions
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 		}
 		valueTile("power", "device.power", decoration: "flat") {

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

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

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

@@ -1,37 +0,0 @@
-# Aeon Siren
-
-Cloud Execution
-
-Works with: 
-
-* [Aeon Labs Siren (Gen 5)](https://www.smartthings.com/works-with-smartthings/aeon-labs/aeon-labs-siren-gen-5)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-
-## Capabilities
-
-* **Actuator** - represents that a Device has commands
-* **Alarm** - allows for interacting with devices that serve as alarms
-* **Switch** - can detect state (possible values: on/off)
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-Aeon Labs Siren (Gen 5) 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:
-* [Aeon Labs Siren (Gen 5) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/204555240-Aeon-Labs-Siren-Gen-5-)

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

@@ -20,11 +20,10 @@ metadata {
 	capability "Actuator"
 	capability "Alarm"
 	capability "Switch"
-	capability "Health Check"
 
 	command "test"
 
-	fingerprint deviceId: "0x1005", inClusters: "0x5E,0x98", deviceJoinName: "Aeon Labs Siren (Gen 5)"
+	fingerprint deviceId: "0x1005", inClusters: "0x5E,0x98"
  }
 
  simulator {
@@ -59,9 +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])
-
 	if(!state.sound) state.sound = 1
 	if(!state.volume) state.volume = 3
 
@@ -152,10 +148,3 @@ def test() {
 private secure(physicalgraph.zwave.Command cmd) {
 	zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
 }
-
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	secure(zwave.basicV1.basicGet())
-}

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

@@ -60,7 +60,7 @@ metadata {
 	// tile definitions
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00a0dc"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 		}
 		valueTile("power", "device.power", decoration: "flat") {
@@ -78,7 +78,7 @@ metadata {
 
 		(1..4).each { n ->
 			standardTile("switch$n", "switch$n", canChangeIcon: true) {
-				state "on", label: '${name}', action: "off$n", icon: "st.switches.switch.on", backgroundColor: "#00a0dc"
+				state "on", label: '${name}', action: "off$n", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 				state "off", label: '${name}', action: "on$n", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 			}
 			valueTile("power$n", "power$n", decoration: "flat") {

devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy

@@ -11,6 +11,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+ 
 metadata {
     definition (name: "Arrival Sensor HA", namespace: "smartthings", author: "SmartThings") {
         capability "Tone"
@@ -39,7 +40,7 @@ metadata {
 
     tiles {
         standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
-            state "present", labelIcon:"st.presence.tile.present", backgroundColor:"#00a0dc"
+            state "present", labelIcon:"st.presence.tile.present", backgroundColor:"#53a7c0"
             state "not present", labelIcon:"st.presence.tile.not-present", backgroundColor:"#ffffff"
         }
         standardTile("beep", "device.beep", decoration: "flat") {
@@ -59,7 +60,7 @@ def updated() {
 }
 
 def configure() {
-    def cmds = zigbee.batteryConfig(20, 20, 0x01)
+    def cmds = zigbee.configureReporting(0x0001, 0x0020, 0x20, 20, 20, 0x01)
     log.debug "configure -- cmds: ${cmds}"
     return cmds
 }
@@ -151,7 +152,7 @@ private handlePresenceEvent(present) {
 
 private startTimer() {
     log.debug "Scheduling periodic timer"
-    runEvery1Minute("checkPresenceCallback")
+    schedule("0 * * * * ?", checkPresenceCallback)
 }
 
 private stopTimer() {

devicetypes/smartthings/arrival-sensor.src/arrival-sensor.groovy

@@ -42,8 +42,8 @@ metadata {
 
 	tiles {
 		standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
-			state "present", labelIcon:"st.presence.tile.present", backgroundColor:"#00a0dc"
-			state "not present", labelIcon:"st.presence.tile.not-present", backgroundColor:"#ffffff"
+			state "present", labelIcon:"st.presence.tile.present", backgroundColor:"#53a7c0"
+			state "not present", labelIcon:"st.presence.tile.not-present", backgroundColor:"#ebeef2"
 		}
 		standardTile("beep", "device.beep", decoration: "flat") {
 			state "beep", label:'', action:"tone.beep", icon:"st.secondary.beep", backgroundColor:"#ffffff"

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

@@ -28,8 +28,6 @@ metadata {
         capability "Refresh"
         capability "Music Player"
         capability "Health Check"
-        capability "Sensor"
-        capability "Actuator"
 
         /**
          * Define all commands, ie, if you have a custom action not
@@ -69,10 +67,10 @@ metadata {
     }
 
     standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-        state "on", label: '${name}', action: "forceOff", icon: "st.Electronics.electronics16", backgroundColor: "#00a0dc", nextState:"turningOff"
+        state "on", label: '${name}', action: "forceOff", icon: "st.Electronics.electronics16", backgroundColor: "#79b821", nextState:"turningOff"
         state "turningOff", label:'TURNING OFF', icon:"st.Electronics.electronics16", backgroundColor:"#ffffff"
         state "off", label: '${name}', action: "forceOn", icon: "st.Electronics.electronics16", backgroundColor: "#ffffff", nextState:"turningOn"
-        state "turningOn", label:'TURNING ON', icon:"st.Electronics.electronics16", backgroundColor:"#00a0dc"
+        state "turningOn", label:'TURNING ON', icon:"st.Electronics.electronics16", backgroundColor:"#79b821"
     }
     valueTile("1", "device.station1", decoration: "flat", canChangeIcon: false) {
         state "station1", label:'${currentValue}', action:"preset1"

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

@@ -55,13 +55,13 @@ metadata {
 			state "fanOn", label:'${name}', action:"thermostat.setThermostatFanMode"
 		}
 		controlTile("heatSliderControl", "device.heatingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "setHeatingSetpoint", action:"thermostat.setHeatingSetpoint", backgroundColor:"#e86d13"
+			state "setHeatingSetpoint", action:"thermostat.setHeatingSetpoint", backgroundColor:"#d04e00"
 		}
 		valueTile("heatingSetpoint", "device.heatingSetpoint", inactiveLabel: false, decoration: "flat") {
 			state "heat", label:'${currentValue}° heat', unit:"F", backgroundColor:"#ffffff"
 		}
 		controlTile("coolSliderControl", "device.coolingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "setCoolingSetpoint", action:"thermostat.setCoolingSetpoint", backgroundColor: "#00a0dc"
+			state "setCoolingSetpoint", action:"thermostat.setCoolingSetpoint", backgroundColor: "#1e9cbb"
 		}
 		valueTile("coolingSetpoint", "device.coolingSetpoint", inactiveLabel: false, decoration: "flat") {
 			state "cool", label:'${currentValue}° cool', unit:"F", backgroundColor:"#ffffff"
@@ -81,47 +81,51 @@ metadata {
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parse description $description"
-	List result = []
-	def descMap = zigbee.parseDescriptionAsMap(description)
-	log.debug "Desc Map: $descMap"
-	List attrData = [[cluster: descMap.cluster ,attrId: descMap.attrId, value: descMap.value]]
-	descMap.additionalAttrs.each {
-	    attrData << [cluster: descMap.cluster, attrId: it.attrId, value: it.value]
-	}
-	attrData.each {
-		def map = [:]
-		if (it.cluster == "0201" && it.attrId == "0000") {
+	def map = [:]
+	if (description?.startsWith("read attr -")) {
+		def descMap = parseDescriptionAsMap(description)
+		log.debug "Desc Map: $descMap"
+		if (descMap.cluster == "0201" && descMap.attrId == "0000") {
 			log.debug "TEMP"
 			map.name = "temperature"
-			map.value = getTemperature(it.value)
+			map.value = getTemperature(descMap.value)
 			map.unit = temperatureScale
-		} else if (it.cluster == "0201" && it.attrId == "0011") {
+		} else if (descMap.cluster == "0201" && descMap.attrId == "0011") {
 			log.debug "COOLING SETPOINT"
 			map.name = "coolingSetpoint"
-			map.value = getTemperature(it.value)
+			map.value = getTemperature(descMap.value)
 			map.unit = temperatureScale
-		} else if (it.cluster == "0201" && it.attrId == "0012") {
+		} else if (descMap.cluster == "0201" && descMap.attrId == "0012") {
 			log.debug "HEATING SETPOINT"
 			map.name = "heatingSetpoint"
-			map.value = getTemperature(it.value)
+			map.value = getTemperature(descMap.value)
 			map.unit = temperatureScale
-		} else if (it.cluster == "0201" && it.attrId == "001c") {
+		} else if (descMap.cluster == "0201" && descMap.attrId == "001c") {
 			log.debug "MODE"
 			map.name = "thermostatMode"
-			map.value = getModeMap()[it.value]
-		} else if (it.cluster == "0202" && it.attrId == "0000") {
+			map.value = getModeMap()[descMap.value]
+		} else if (descMap.cluster == "0202" && descMap.attrId == "0000") {
 			log.debug "FAN MODE"
 			map.name = "thermostatFanMode"
-			map.value = getFanModeMap()[it.value]
+			map.value = getFanModeMap()[descMap.value]
 		}
-		if (map) {
-			result << createEvent(map)
-		}
-		log.debug "Parse returned $map"
 	}
+
+	def result = null
+	if (map) {
+		result = createEvent(map)
+	}
+	log.debug "Parse returned $map"
 	return result
 }
 
+def parseDescriptionAsMap(description) {
+	(description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+}
+
 def getModeMap() { [
 	"00":"off",
 	"03":"cool",

devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy

@@ -36,7 +36,7 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: '${name}', action: "switch.on", icon: "st.Home.home30", backgroundColor: "#ffffff"
-			state "on", label: '${name}', action: "switch.off", icon: "st.Home.home30", backgroundColor: "#00a0dc"
+			state "on", label: '${name}', action: "switch.off", icon: "st.Home.home30", backgroundColor: "#79b821"
 		}
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"

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

@@ -23,7 +23,6 @@ metadata {
         capability "Switch"
         capability "Switch Level"
         capability "Health Check"
-        capability "Light"
 
         fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
     }
@@ -43,9 +42,9 @@ metadata {
     tiles(scale: 2) {
         multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
             tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-                attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+                attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
                 attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
-                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
                 attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
             }
             tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -83,7 +82,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()       //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 /**

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

@@ -81,13 +81,13 @@ metadata {
 			state "fanCirculate", label:'${name}', action:"switchFanMode"
 		}
 		controlTile("heatSliderControl", "device.heatingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "setHeatingSetpoint", action:"quickSetHeat", backgroundColor:"#e86d13"
+			state "setHeatingSetpoint", action:"quickSetHeat", backgroundColor:"#d04e00"
 		}
 		valueTile("heatingSetpoint", "device.heatingSetpoint", inactiveLabel: false, decoration: "flat") {
 			state "heat", label:'${currentValue}° heat', backgroundColor:"#ffffff"
 		}
 		controlTile("coolSliderControl", "device.coolingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "setCoolingSetpoint", action:"quickSetCool", backgroundColor: "#00a0dc"
+			state "setCoolingSetpoint", action:"quickSetCool", backgroundColor: "#1e9cbb"
 		}
 		valueTile("coolingSetpoint", "device.coolingSetpoint", inactiveLabel: false, decoration: "flat") {
 			state "cool", label:'${currentValue}° cool', backgroundColor:"#ffffff"

devicetypes/smartthings/danalock.src/danalock.groovy

@@ -33,10 +33,10 @@ metadata {
 
 	tiles {
 		standardTile("toggle", "device.lock", width: 2, height: 2) {
-			state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#00a0dc", nextState:"unlocking"
+			state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821", nextState:"unlocking"
 			state "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff", nextState:"locking"
 			state "unknown", label:"unknown", action:"lock.lock", icon:"st.locks.lock.unknown", backgroundColor:"#ffffff", nextState:"locking"
-			state "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#00a0dc"
+			state "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#79b821"
 			state "unlocking", label:'unlocking', icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
 		}
 		standardTile("lock", "device.lock", inactiveLabel: false, decoration: "flat") {

devicetypes/smartthings/dimmer-switch.src/README.md

@@ -7,8 +7,6 @@ Works with:
 * [GE Z-Wave In-Wall Smart Dimmer (GE 12724)](http://products.z-wavealliance.org/products/1197)
 * [GE Z-Wave In-Wall Smart Dimmer (Toggle) (GE 12729)](http://products.z-wavealliance.org/products/1201)
 * [GE Z-Wave Plug-in Smart Dimmer (GE 12718)](http://products.z-wavealliance.org/products/1191)
-* [GE 1,000-Watt In-Wall Smart Dimmer Switch (GE 12725)](http://products.z-wavealliance.org/products/1198)
-* [GE In-Wall Smart Fan Control (GE 12730)](http://products.z-wavealliance.org/products/1202)
 
 ## Table of contents
 
@@ -29,7 +27,7 @@ Works with:
 
 ## Device Health
 
-Z-Wave Smart Dimmers (In-Wall, In-Wall(Toggle), Plug-In), 1000-watt In-Wall Smart Dimmer Switch and In-Wall Smart Fan Control are polled by the hub.
+Z-Wave Smart Dimmers (In-Wall, In-Wall(Toggle), Plug-In) are 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.
 Check-in interval = 32 mins.
 Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for
@@ -46,6 +44,4 @@ Instructions related to pairing, resetting and removing the device from SmartThi
 * [General Z-Wave Dimmer/Switch Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200955890-Troubleshooting-GE-in-wall-switch-or-dimmer-won-t-respond-to-commands-or-automations-Z-Wave-)
 * [GE Z-Wave In-Wall Smart Dimmer (GE 12724) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200902600-GE-In-Wall-Paddle-Dimmer-Switch-GE-12724-Z-Wave-)
 * [GE Z-Wave In-Wall Smart Dimmer (Toggle) (GE 12729) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/207568463-GE-In-Wall-Smart-Toggle-Dimmer-GE-12729-Z-Wave-)
-* [GE Z-Wave Plug-in Smart Dimmer (GE 12718) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202088474-GE-Plug-In-Smart-Dimmer-GE-12718-Z-Wave-)
-* [GE 1,000-Watt In-Wall Smart Dimmer Switch (GE 12725) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200879274)
-* [GE In-Wall Smart Fan Control (GE 12730) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200879274)
+* [GE Z-Wave Plug-in Smart Dimmer (GE 12718) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202088474-GE-Plug-In-Smart-Dimmer-GE-12718-Z-Wave-)

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"
@@ -21,7 +21,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 
 		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "GE In-Wall Smart Dimmer "
 		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "GE In-Wall Smart Dimmer "
@@ -54,9 +53,9 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {

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

@@ -47,8 +47,8 @@ metadata {
 		}
 
 		standardTile("motion", "device.motion") {
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc")
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
+			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
 		}
 
 		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {

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

@@ -32,7 +32,7 @@ metadata {
 		command "switchMode"
 		command "switchFanMode"
 
-		attribute "displayThermostatSetpoint", "string" // Added to be able to show "Auto"/"Off" keeping attribute thermostatSetpoint a number
+		attribute "thermostatSetpoint", "number"
 		attribute "thermostatStatus", "string"
 		attribute "maxHeatingSetpoint", "number"
 		attribute "minHeatingSetpoint", "number"
@@ -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 "auxHeatOnly", action:"switchMode", icon: "st.thermostat.emergency-heat"
 			state "updating", label:"Working", icon: "st.secondary.secondary"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
@@ -81,8 +81,8 @@ metadata {
 		standardTile("upButtonControl", "device.thermostatSetpoint", inactiveLabel: false, decoration: "flat") {
 			state "setpoint", action:"raiseSetpoint", icon:"st.thermostat.thermostat-up"
 		}
-		valueTile("displayThermostatSetpoint", "device.displayThermostatSetpoint", width: 1, height: 1, decoration: "flat") {
-			state "displayThermostatSetpoint", label:'${currentValue}'
+		valueTile("thermostatSetpoint", "device.thermostatSetpoint", width: 1, height: 1, decoration: "flat") {
+			state "thermostatSetpoint", label:'${currentValue}'
 		}
 		valueTile("currentStatus", "device.thermostatStatus", height: 1, width: 2, decoration: "flat") {
 			state "thermostatStatus", label:'${currentValue}', backgroundColor:"#ffffff"
@@ -113,7 +113,7 @@ metadata {
 			state "humidity", label:'${currentValue}%'
 		}
 		main "temperature"
-		details(["temperature", "upButtonControl", "displayThermostatSetpoint", "currentStatus", "downButtonControl", "mode", "fanMode","humidity", "resumeProgram", "refresh"])
+		details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "fanMode","humidity", "resumeProgram", "refresh"])
 	}
 
 	preferences {
@@ -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
@@ -457,10 +452,10 @@ def emergencyHeat() {
 }
 
 def auxHeatOnly() {
-	log.debug "auxHeatOnly = emergency heat"
+	log.debug "auxHeatOnly"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
 	if (parent.setMode ("auxHeatOnly", deviceId))
-		generateModeEvent("emergency heat") // emergency heat = auxHeatOnly
+		generateModeEvent("auxHeatOnly")
 	else {
 		log.debug "Error setting new mode."
 		def currentMode = device.currentState("thermostatMode")?.value
@@ -579,23 +574,17 @@ def generateSetpointEvent() {
 	sendEvent("name":"heatingSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
 	sendEvent("name":"coolingSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
 
-	def averageSetpoint = roundC((heatingSetpoint + coolingSetpoint) / 2)
 	if (mode == "heat") {
 		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
-		sendEvent("name":"displayThermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale, displayed: false)
 	}
 	else if (mode == "cool") {
 		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
-		sendEvent("name":"displayThermostatSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale, displayed: false)
 	} else if (mode == "auto") {
-		sendEvent("name":"thermostatSetpoint", "value":averageSetpoint, "unit":location.temperatureScale)
-		sendEvent("name":"displayThermostatSetpoint", "value":"Auto", displayed: false)
+		sendEvent("name":"thermostatSetpoint", "value":"Auto")
 	} else if (mode == "off") {
-		sendEvent("name":"thermostatSetpoint", "value":averageSetpoint, "unit":location.temperatureScale)
-		sendEvent("name":"displayThermostatSetpoint", "value":"Off", displayed: false)
-	} else if (mode == "emergency heat") { // emergency heat = auxHeatOnly
+		sendEvent("name":"thermostatSetpoint", "value":"Off")
+	} else if (mode == "auxHeatOnly") {
 		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
-		sendEvent("name":"displayThermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale, displayed: false)
 	}
 }
 
@@ -632,14 +621,13 @@ void raiseSetpoint() {
 		targetvalue = thermostatSetpoint ? thermostatSetpoint : 0
 		targetvalue = location.temperatureScale == "F"? targetvalue + 1 : targetvalue + 0.5
 
-		if ((mode == "heat" || mode == "emergency heat") && targetvalue > maxHeatingSetpoint) { // emergency heat = auxHeatOnly
+		if ((mode == "heat" || mode == "auxHeatOnly") && targetvalue > maxHeatingSetpoint) {
 			targetvalue = maxHeatingSetpoint
 		} else if (mode == "cool" && targetvalue > maxCoolingSetpoint) {
 			targetvalue = maxCoolingSetpoint
 		}
 
 		sendEvent("name":"thermostatSetpoint", "value":targetvalue, "unit":location.temperatureScale, displayed: false)
-		sendEvent("name":"displayThermostatSetpoint", "value":targetvalue, "unit":location.temperatureScale, displayed: false)
 		log.info "In mode $mode raiseSetpoint() to $targetvalue"
 
 		runIn(3, "alterSetpoint", [data: [value:targetvalue], overwrite: true]) //when user click button this runIn will be overwrite
@@ -678,14 +666,13 @@ void lowerSetpoint() {
 		targetvalue = thermostatSetpoint ? thermostatSetpoint : 0
 		targetvalue = location.temperatureScale == "F"? targetvalue - 1 : targetvalue - 0.5
 
-		if ((mode == "heat" || mode == "emergency heat") && targetvalue < minHeatingSetpoint) { // emergency heat = auxHeatOnly
+		if ((mode == "heat" || mode == "auxHeatOnly") && targetvalue < minHeatingSetpoint) {
 			targetvalue = minHeatingSetpoint
 		} else if (mode == "cool" && targetvalue < minCoolingSetpoint) {
 			targetvalue = minCoolingSetpoint
 		}
 
 		sendEvent("name":"thermostatSetpoint", "value":targetvalue, "unit":location.temperatureScale, displayed: false)
-		sendEvent("name":"displayThermostatSetpoint", "value":targetvalue, "unit":location.temperatureScale, displayed: false)
 		log.info "In mode $mode lowerSetpoint() to $targetvalue"
 
 		runIn(3, "alterSetpoint", [data: [value:targetvalue], overwrite: true]) //when user click button this runIn will be overwrite
@@ -719,7 +706,7 @@ void alterSetpoint(temp) {
 		}
 
 		//step1: check thermostatMode, enforce limits before sending request to cloud
-		if (mode == "heat" || mode == "emergency heat"){ // emergency heat = auxHeatOnly
+		if (mode == "heat" || mode == "auxHeatOnly"){
 			if (temp.value > coolingSetpoint){
 				targetHeatingSetpoint = temp.value
 				targetCoolingSetpoint = temp.value
@@ -748,18 +735,15 @@ void alterSetpoint(temp) {
 
 		if (parent.setHold(heatingValue, coolingValue, deviceId, sendHoldType)) {
 			sendEvent("name": "thermostatSetpoint", "value": temp.value, displayed: false)
-			sendEvent("name": "displayThermostatSetpoint", "value": temp.value, displayed: false)
 			sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint, "unit": location.temperatureScale)
 			sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint, "unit": location.temperatureScale)
 			log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
 		} else {
 			log.error "Error alterSetpoint()"
-			if (mode == "heat" || mode == "emergency heat"){ // emergency heat = auxHeatOnly
+			if (mode == "heat" || mode == "auxHeatOnly"){
 				sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
-				sendEvent("name": "displayThermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
 			} else if (mode == "cool") {
 				sendEvent("name": "thermostatSetpoint", "value": coolingSetpoint.toString(), displayed: false)
-				sendEvent("name": "displayThermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
 			}
 		}
 
@@ -775,7 +759,6 @@ def generateStatusEvent() {
 	def coolingSetpoint = device.currentValue("coolingSetpoint")
 	def temperature = device.currentValue("temperature")
 	def statusText
-	def operatingState = "idle"
 
 	log.debug "Generate Status Event for Mode = ${mode}"
 	log.debug "Temperature = ${temperature}"
@@ -784,29 +767,20 @@ def generateStatusEvent() {
 	log.debug "HVAC Mode = ${mode}"
 
 	if (mode == "heat") {
-		if (temperature >= heatingSetpoint) {
+		if (temperature >= heatingSetpoint)
 			statusText = "Right Now: Idle"
-		} else {
+		else
 			statusText = "Heating to ${heatingSetpoint} ${location.temperatureScale}"
-			operatingState = "heating"
-		}
 	} else if (mode == "cool") {
-		if (temperature <= coolingSetpoint) {
+		if (temperature <= coolingSetpoint)
 			statusText = "Right Now: Idle"
-		} else {
+		else
 			statusText = "Cooling to ${coolingSetpoint} ${location.temperatureScale}"
-			operatingState = "cooling"
-		}
 	} else if (mode == "auto") {
 		statusText = "Right Now: Auto"
-		if (temperature < heatingSetpoint) {
-			operatingState = "heating"
-		} else if (temperature > coolingSetpoint) {
-			operatingState = "cooling"
-		}
 	} else if (mode == "off") {
 		statusText = "Right Now: Off"
-	} else if (mode == "emergency heat") { // emergency heat = auxHeatOnly
+	} else if (mode == "auxHeatOnly") {
 		statusText = "Emergency Heat"
 	} else {
 		statusText = "?"
@@ -814,7 +788,6 @@ def generateStatusEvent() {
 
 	log.debug "Generate Status Event = ${statusText}"
 	sendEvent("name":"thermostatStatus", "value":statusText, "description":statusText, displayed: true)
-	sendEvent("name":"thermostatOperatingState", "value":operatingState, "description":operatingState, displayed: false)
 }
 
 def generateActivityFeedsEvent(notificationMessage) {

devicetypes/smartthings/econet-vent.src/.st-ignore

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

devicetypes/smartthings/econet-vent.src/README.md

@@ -1,43 +0,0 @@
-# EcoNet Vent
-
-Cloud Execution
-
-Works with: 
-
-* [EcoNet Controls Z-Wave Vent](https://www.smartthings.com/works-with-smartthings/econet-controls/econet-controls-z-wave-vent)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Troubleshooting](#troubleshooting)
-
-## Capabilities
-
-* **Switch Level** - allows for the control of the level attribute of a light
-* **Actuator** - represents that a Device has commands
-* **Switch** - allows for the control of a switch device
-* **Battery** - defines that the device has a battery
-* **Refresh** - _refresh()_ command for status updates
-* **Sensor** - detects sensor events
-* **Polling** - allows for the polling of devices that support it
-* **Configuration** - allow configuration of devices that support it
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-EcoNet Controls Z-Wave Vent 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:
-* [EcoNet Controls Z-Wave Vent Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/204556420-EcoNet-EV100-Vent)

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

@@ -26,13 +26,11 @@ metadata {
 		capability "Sensor"
         capability "Polling"
         capability "Configuration"
-		capability "Health Check"
 
 		command "open"
 		command "close"
 
 		fingerprint deviceId: "0x1100", inClusters: "0x26,0x72,0x86,0x77,0x80,0x20"
-		fingerprint mfr:"0157", prod:"0100", model:"0100", deviceJoinName: "EcoNet Controls Z-Wave Vent"
 	}
 
 	simulator {
@@ -55,7 +53,7 @@ metadata {
 
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", action:"switch.off", icon:"st.vents.vent-open-text", backgroundColor:"#00a0dc"
+			state "on", action:"switch.off", icon:"st.vents.vent-open-text", backgroundColor:"#53a7c0"
 			state "off", action:"switch.on", icon:"st.vents.vent-closed", backgroundColor:"#ffffff"
 		}
         valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat") {
@@ -87,8 +85,6 @@ def parse(String description) {
 
 //send the command to stop polling
 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])
 	response("poll stop")
 }
 
@@ -173,13 +169,6 @@ def setLevel(value, duration) {
 	setLevel(value)
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	refresh()
-}
-
 def refresh() {
 	delayBetween([
 		zwave.switchMultilevelV1.switchMultilevelGet().format(),

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

@@ -17,7 +17,6 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
 
 		fingerprint deviceId: "0xA102", inClusters: "0x86,0x72,0x85,0x84,0x80,0x70,0x9C,0x20,0x71"
 	}
@@ -34,7 +33,7 @@ metadata {
 		multiAttributeTile(name:"water", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.water", key: "PRIMARY_CONTROL") {
 				attributeState "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"
-				attributeState "wet", icon:"st.alarm.water.wet", backgroundColor:"#00a0dc"
+				attributeState "wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
 			}
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
@@ -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-dimmer.src/fibaro-dimmer.groovy

@@ -56,9 +56,9 @@ metadata {
 
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff"
+			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff"
+			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 		}
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {

devicetypes/smartthings/fibaro-door-window-sensor.src/.st-ignore

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

devicetypes/smartthings/fibaro-door-window-sensor.src/README.md

@@ -1,40 +0,0 @@
-# Fibaro Door Window Sensor
-
-Cloud Execution
-
-Works with: 
-
-* [Fibaro Door/Window Sensor](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
-
-* **Contact Sensor** - can detect contact (possible values: open,closed)
-* **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
-
-Fibaro Door/Window Sensor 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 Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/204075194-Fibaro-Door-Window-Sensor)

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

@@ -39,8 +39,7 @@
 		capability 	"Contact Sensor"
 		capability 	"Sensor"
 		capability 	"Battery"
-		capability 	"Configuration"
-		capability  "Health Check"
+        capability 	"Configuration"
         
         command		"resetParams2StDefaults"
         command		"listCurrentParams"
@@ -267,9 +266,6 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
  */
 def configure() {
 	log.debug "Configuring Device..."
-	// 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.configurationV1.configurationSet(configurationValue: [0,0], parameterNumber: 1, size: 2).format()
 	// send associate to group 3 to get sensor data reported only to hub

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

@@ -1,12 +1,12 @@
 /**
  *  Device Type Definition File
  *
- *  Device Type:        Fibaro Flood Sensor
- *  File Name:          fibaro-flood-sensor.groovy
- *  Initial Release:    2014-12-10
- *  @author:            Todd Wackford
- *  Email:              todd@wackford.net
- *  @version:           1.0
+ *  Device Type:		Fibaro Flood Sensor
+ *  File Name:			fibaro-flood-sensor.groovy
+ *	Initial Release:	2014-12-10
+ *	@author:			Todd Wackford
+ *  Email:				todd@wackford.net
+ *  @version:			1.0
  *
  *  Copyright 2014 SmartThings
  *
@@ -26,8 +26,8 @@
  * not displayed to the user. We do this so we can receive events and display on device 
  * activity. If the user wants to display the tamper tile, adjust the tile display lines
  * with the following:
- *      main(["water", "temperature", "tamper"])
- *      details(["water", "temperature", "battery", "tamper"])
+ *		main(["water", "temperature", "tamper"])
+ *		details(["water", "temperature", "battery", "tamper"])
  *
  * @param none
  *
@@ -39,18 +39,13 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Configuration"
 		capability "Battery"
-		capability "Health Check"
-    capability "Sensor"
-    
-		command    "resetParams2StDefaults"
-		command    "listCurrentParams"
-		command    "updateZwaveParam"
-		command    "test"
-
+       
+        command		"resetParams2StDefaults"
+        command		"listCurrentParams"
+        command		"updateZwaveParam"
+        command		"test"
+        
 		fingerprint deviceId: "0xA102", inClusters: "0x30,0x9C,0x60,0x85,0x8E,0x72,0x70,0x86,0x80,0x84"
-		fingerprint mfr:"010F", prod:"0000", model:"2002"
-		fingerprint mfr:"010F", prod:"0000", model:"1002"
-		fingerprint mfr:"010F", prod:"0B00", model:"1001"
 	}
 
 	simulator {
@@ -77,7 +72,7 @@ metadata {
 	tiles {
 		standardTile("water", "device.water", width: 2, height: 2) {
 			state "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"
-			state "wet", icon:"st.alarm.water.wet", backgroundColor:"#00a0dc"
+			state "wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false) {
 			state "temperature", label:'${currentValue}°',
@@ -91,9 +86,9 @@ metadata {
 				[value: 96, color: "#bc2323"]
 			]
 		}
-		standardTile("tamper", "device.tamper") {
-			state("secure",         label:"secure",         icon:"st.locks.lock.locked",   backgroundColor:"#ffffff")
-			state("tampered",       label:"tampered",       icon:"st.locks.lock.unlocked", backgroundColor:"#00a0dc")
+        standardTile("tamper", "device.tamper") {
+			state("secure", 	label:"secure",   	icon:"st.locks.lock.locked",   backgroundColor:"#ffffff")
+			state("tampered", 	label:"tampered", 	icon:"st.locks.lock.unlocked", backgroundColor:"#53a7c0")
 		}
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat") {
 			state "battery", label:'${currentValue}% battery', unit:""
@@ -111,17 +106,26 @@ metadata {
 def parse(String description)
 {
 	def result = []
-
-	def cmd = zwave.parse(description, [0x31: 2, 0x30: 1, 0x70: 2, 0x71: 1, 0x84: 1, 0x80: 1, 0x9C: 1, 0x72: 2, 0x56: 2, 0x60: 3])
-
-	if (cmd) {
-		result += zwaveEvent(cmd) //createEvent(zwaveEvent(cmd))   
-	}
-
-	if ( result[0] != null ) {
+	
+    if (description == "updated") {
+    	if (!state.MSR) {
+			result << response(zwave.wakeUpV1.wakeUpIntervalSet(seconds: 60*60, nodeid:zwaveHubNodeId))
+			result << response(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
+		} 
+    } else {
+		def cmd = zwave.parse(description, [0x31: 2, 0x30: 1, 0x70: 2, 0x71: 1, 0x84: 1, 0x80: 1, 0x9C: 1, 0x72: 2, 0x56: 2, 0x60: 3])
+    
+		if (cmd) {
+			result += zwaveEvent(cmd) //createEvent(zwaveEvent(cmd))   
+		}
+    }
+    
+    result << response(zwave.batteryV1.batteryGet().format())
+    
+    if ( result[0] != null ) {
 		log.debug "Parse returned ${result}"
 		result
-	}
+    }
 }
 
 
@@ -138,9 +142,10 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd) {
 	def result = [createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)]
 	if (!isConfigured()) {
 		// we're still in the process of configuring a newly joined device
-		result << lateConfigure(true)
+		result += lateConfigure(true)
 	} else {
-		result << response(zwave.wakeUpV1.wakeUpNoMoreInformation())
+		result += response(zwave.wakeUpV1.wakeUpNoMoreInformation())
+        log.debug "We're done with WakeUp!"
 	}
 	result
 }
@@ -148,7 +153,7 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd) {
 def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv2.SensorMultilevelReport cmd)
 {
 	def map = [:]
-
+    
 	switch (cmd.sensorType) {
 		case 1:
 			// temperature
@@ -179,7 +184,7 @@ def zwaveEvent(physicalgraph.zwave.commands.sensorbinaryv1.SensorBinaryReport cm
 	def map = [:]
 	map.value = cmd.sensorValue ? "active" : "inactive"
 	map.name = "acceleration"
-
+    
 	if (map.value == "active") {
 		map.descriptionText = "$device.displayName detected vibration"
 	}
@@ -194,49 +199,49 @@ def zwaveEvent(physicalgraph.zwave.commands.configurationv2.ConfigurationReport
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
-	log.debug "BasicSet with CMD = ${cmd}"
-
-	if (!isConfigured()) {
-		def result = []
-		def map = [:]
-
-		map.name = "water"
+    log.debug "BasicSet with CMD = ${cmd}"
+    
+    if (!isConfigured()) {
+    	def result = []
+    	def map = [:]
+    
+    	map.name = "water"
 		map.value = cmd.value ? "wet" : "dry"
 		map.descriptionText = "${device.displayName} is ${map.value}"
-
-		// If we are getting a BasicSet, and isConfigured == false, then we are likely NOT properly configured.
-		result += lateConfigure(true)
-
-		result << createEvent(map)
-
-		result
-	}
+    
+    	// If we are getting a BasicSet, and isConfigured == false, then we are likely NOT properly configured.
+    	result += lateConfigure(true)
+    
+    	result << createEvent(map)
+        
+        result
+    }
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.sensoralarmv1.SensorAlarmReport cmd)
 {
 	def map = [:]
-
+    
 	if (cmd.sensorType == 0x05) {
 		map.name = "water"
 		map.value = cmd.sensorState ? "wet" : "dry"
 		map.descriptionText = "${device.displayName} is ${map.value}"
-
-		log.debug "CMD = SensorAlarmReport: ${cmd}"
-		setConfigured()
-	} else if ( cmd.sensorType == 0) {
-		map.name = "tamper"
-		map.isStateChange = true
-		map.value = cmd.sensorState ? "tampered" : "secure"
-		map.descriptionText = "${device.displayName} has been tampered with"
-		runIn(30, "resetTamper") //device does not send alarm cancelation
-
-	} else if ( cmd.sensorType == 1) {
-		map.name = "tamper"
-		map.value = cmd.sensorState ? "tampered" : "secure"
-		map.descriptionText = "${device.displayName} has been tampered with"
-		runIn(30, "resetTamper") //device does not send alarm cancelation
-
+        
+        log.debug "CMD = SensorAlarmReport: ${cmd}"
+    	setConfigured()
+    } else if ( cmd.sensorType == 0) {
+    	map.name = "tamper"
+        map.isStateChange = true
+        map.value = cmd.sensorState ? "tampered" : "secure"
+        map.descriptionText = "${device.displayName} has been tampered with"
+        runIn(30, "resetTamper") //device does not send alarm cancelation
+        
+    } else if ( cmd.sensorType == 1) {
+    	map.name = "tamper"
+        map.value = cmd.sensorState ? "tampered" : "secure"
+        map.descriptionText = "${device.displayName} has been tampered with"
+        runIn(30, "resetTamper") //device does not send alarm cancelation
+        
 	} else {
 		map.descriptionText = "${device.displayName}: ${cmd}"
 	}
@@ -245,10 +250,10 @@ def zwaveEvent(physicalgraph.zwave.commands.sensoralarmv1.SensorAlarmReport cmd)
 
 def resetTamper() {
 	def map = [:]
-	map.name = "tamper"
-	map.value = "secure"
-	map.descriptionText = "$device.displayName is secure"
-	sendEvent(map)
+    map.name = "tamper"
+    map.value = "secure"
+    map.descriptionText = "$device.displayName is secure"
+    sendEvent(map)
 }
 
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
@@ -262,10 +267,10 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
 	log.debug "msr: $msr"
 	device.updateDataValue(["MSR", msr])
-
-	if ( msr == "010F-0B00-2001" ) { //this is the msr and device type for the fibaro flood sensor
-		result += lateConfigure(true)
-	}
+    
+    if ( msr == "010F-0B00-2001" ) { //this is the msr and device type for the fibaro flood sensor
+    	result += lateConfigure(true)
+    }
 
 	result << createEvent(descriptionText: "$device.displayName MSR: $msr", isStateChange: false)
 	result
@@ -277,17 +282,17 @@ def setConfigured() {
 
 def isConfigured() {
 	Boolean configured = device.getDataValue(["configured"]) as Boolean
-
-	return configured
+    
+    return configured
 }
 
 def lateConfigure(setConf = False) {
 	def res = response(configure())
-
-	if (setConf)
-		setConfigured()
-
-	return res
+    
+    if (setConf)
+        setConfigured()
+        
+    return res
 }
 
  /**
@@ -299,34 +304,26 @@ def lateConfigure(setConf = False) {
  */
 def configure() {
 	log.debug "Configuring Device..."
-	// 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])
-
-	// default initial state
-	sendEvent(name: "water", value: "dry")
-
-	def cmds = []
-
-	// send associate to group 2 to get alarm data
-	cmds << zwave.associationV2.associationSet(groupingIdentifier:2, nodeId:[zwaveHubNodeId]).format()
-
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [255], parameterNumber: 5, size: 1).format()
-
-	// send associate to group 3 to get sensor data reported only to hub
-	cmds << zwave.associationV2.associationSet(groupingIdentifier:3, nodeId:[zwaveHubNodeId]).format()
-
-	// reporting frequency of temps and battery set to one hour
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,60*60], parameterNumber: 10, size: 2).format()
-	// cmds << zwave.configurationV1.configurationGet(parameterNumber: 10).format()
+    def cmds = []
+    
+    // send associate to group 2 to get alarm data
+    cmds << zwave.associationV2.associationSet(groupingIdentifier:2, nodeId:[zwaveHubNodeId]).format()
+    
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [255], parameterNumber: 5, size: 1).format()
+    
+    // send associate to group 3 to get sensor data reported only to hub
+    cmds << zwave.associationV2.associationSet(groupingIdentifier:3, nodeId:[zwaveHubNodeId]).format()
 
 	// temp hysteresis set to .5 degrees celcius
 	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,50], parameterNumber: 12, size: 2).format()
-	// cmds << zwave.configurationV1.configurationGet(parameterNumber: 12).format()
-
-	cmds << zwave.batteryV1.batteryGet().format()
-
-	cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 12).format()
 
+	// reporting frequency of temps and battery set to one hour
+	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,60*60], parameterNumber: 10, size: 2).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 10).format()
+    
+    cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
+    
 	delayBetween(cmds, 100)
 }
 
@@ -352,18 +349,18 @@ def test() {
  * @return none
  */
 def updateZwaveParam(params) {
-	if ( params ) {
-		def pNumber = params.paramNumber
-		def pSize	= params.size
-		def pValue	= [params.value]
-		log.debug "Make sure device is awake and in recieve mode (triple-click?)"
-		log.debug "Updating ${device.displayName} parameter number '${pNumber}' with value '${pValue}' with size of '${pSize}'"
+	if ( params ) {     
+        def pNumber = params.paramNumber
+        def pSize	= params.size
+        def pValue	= [params.value]
+        log.debug "Make sure device is awake and in recieve mode (triple-click?)"
+        log.debug "Updating ${device.displayName} parameter number '${pNumber}' with value '${pValue}' with size of '${pSize}'"
 
 		def cmds = []
-		cmds << zwave.configurationV1.configurationSet(configurationValue: pValue, parameterNumber: pNumber, size: pSize).format()
-		cmds << zwave.configurationV1.configurationGet(parameterNumber: pNumber).format()
-		delayBetween(cmds, 1000)
-	}
+        cmds << zwave.configurationV1.configurationSet(configurationValue: pValue, parameterNumber: pNumber, size: pSize).format()
+        cmds << zwave.configurationV1.configurationGet(parameterNumber: pNumber).format()
+        delayBetween(cmds, 1000)        
+    }
 }
 
  /**
@@ -380,26 +377,26 @@ def updateZwaveParam(params) {
 def resetParams2StDefaults() {
 	log.debug "Resetting ${device.displayName} parameters to SmartThings compatible defaults"
 	def cmds = []
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,0],			parameterNumber: 1,	 size: 2).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [3],				parameterNumber: 2,	 size: 1).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [255],			parameterNumber: 5,	 size: 1).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [255],			parameterNumber: 7,	 size: 1).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [1],				parameterNumber: 9,	 size: 1).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,60*60],		parameterNumber: 10, size: 2).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,50],			parameterNumber: 12, size: 2).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0],				parameterNumber: 13, size: 1).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [5,220],			parameterNumber: 50, size: 2).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [13,172],		parameterNumber: 51, size: 2).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,0,0,225],		parameterNumber: 61, size: 4).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,255,0,0],		parameterNumber: 62, size: 4).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [2],				parameterNumber: 63, size: 1).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,0],			parameterNumber: 73, size: 2).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [2],				parameterNumber: 74, size: 1).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,0],			parameterNumber: 75, size: 2).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,0],			parameterNumber: 76, size: 2).format()
-	cmds << zwave.configurationV1.configurationSet(configurationValue: [0],				parameterNumber: 77, size: 1).format()
-
-	delayBetween(cmds, 1200)
+	cmds << zwave.configurationV1.configurationSet(configurationValue: [0,0], 			parameterNumber: 1,  size: 2).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [3], 			parameterNumber: 2,  size: 1).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [255], 			parameterNumber: 5,  size: 1).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [255], 			parameterNumber: 7,  size: 1).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [1], 			parameterNumber: 9,  size: 1).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [0,60*60], 		parameterNumber: 10, size: 2).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [0,50], 			parameterNumber: 12, size: 2).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [0],				parameterNumber: 13, size: 1).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [5,220], 		parameterNumber: 50, size: 2).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [13,172],		parameterNumber: 51, size: 2).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [0,0,0,225],		parameterNumber: 61, size: 4).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [0,255,0,0], 	parameterNumber: 62, size: 4).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [2], 			parameterNumber: 63, size: 1).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [0,0], 			parameterNumber: 73, size: 2).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [2], 			parameterNumber: 74, size: 1).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [0,0], 			parameterNumber: 75, size: 2).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [0,0], 			parameterNumber: 76, size: 2).format()
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [0], 			parameterNumber: 77, size: 1).format()
+    
+    delayBetween(cmds, 1200)
 }
 
  /**
@@ -416,25 +413,25 @@ def resetParams2StDefaults() {
 def listCurrentParams() {
 	log.debug "Listing of current parameter settings of ${device.displayName}"
 	def cmds = []
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 1).format() 
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 2).format() 
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 5).format() 
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 7).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 9).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 10).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 12).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 13).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 50).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 51).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 61).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 62).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 63).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 73).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 74).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 75).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 76).format()
-	cmds << zwave.configurationV1.configurationGet(parameterNumber: 77).format()
-
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 1).format() 
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 2).format() 
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 5).format() 
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 7).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 9).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 10).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 12).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 13).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 50).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 51).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 61).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 62).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 63).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 73).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 74).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 75).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 76).format()
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 77).format()
+    
 	delayBetween(cmds, 1200)
 }
 

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

@@ -46,7 +46,6 @@
 		capability 	"Illuminance Measurement"
 		capability 	"Sensor"
 		capability 	"Battery"
-		capability  "Health Check"
         
         command		"resetParams2StDefaults"
         command		"listCurrentParams"
@@ -82,8 +81,8 @@
 
 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
-			state "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00a0dc"
-			state "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc"
+			state "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
+			state "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false) {
 			state "temperature", label:'${currentValue}°',
@@ -126,9 +125,6 @@
  */
 def configure() {
 	log.debug "Configuring Device For SmartThings Use"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	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

devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy

@@ -89,9 +89,9 @@
             state "whiteLevel", action:"setWhiteLevel", label:'White Level'
         }
 		standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-        	state "on", label:'${name}', action:"switch.off", icon:"st.illuminance.illuminance.bright", backgroundColor:"#00A0DC", nextState:"turningOff"
+        	state "on", label:'${name}', action:"switch.off", icon:"st.illuminance.illuminance.bright", backgroundColor:"#79b821", nextState:"turningOff"
             state "off", label:'${name}', action:"switch.on", icon:"st.illuminance.illuminance.dark", backgroundColor:"#ffffff", nextState:"turningOn"
-            state "turningOn", label:'${name}', icon:"st.illuminance.illuminance.bright", backgroundColor:"#00A0DC"
+            state "turningOn", label:'${name}', icon:"st.illuminance.illuminance.bright", backgroundColor:"#79b821"
             state "turningOff", label:'${name}', icon:"st.illuminance.illuminance.dark", backgroundColor:"#ffffff"
         }
         valueTile("power", "device.power", decoration: "flat") {

devicetypes/smartthings/fortrezz-water-valve.src/.st-ignore

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

devicetypes/smartthings/fortrezz-water-valve.src/README.md

@@ -1,39 +0,0 @@
-# FortrezZ Water Valve
-
-Cloud Execution
-
-Works with: 
-
-* [FortrezZ Water Valve](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
-* **Health Check** - indicates ability to get device health notifications
-* **Valve** - allows for the control of a valve device
-* **Refresh** - _refresh()_ command for status updates
-* **Sensor** - detects sensor events
-
-## Device Health
-
-FortrezZ Water Valve 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 Water Valve Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202088434-FortrezZ-Water-Valve-Shutoff)

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

@@ -14,13 +14,11 @@
 metadata {
 	definition (name: "Fortrezz Water Valve", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
-		capability "Health Check"
 		capability "Valve"
 		capability "Refresh"
 		capability "Sensor"
         
 		fingerprint deviceId: "0x1000", inClusters: "0x25,0x72,0x86,0x71,0x22,0x70"
-		fingerprint mfr:"0084", prod:"0213", model:"0215", deviceJoinName: "FortrezZ Water Valve"
 	}
 
 	// simulator metadata
@@ -36,10 +34,10 @@ metadata {
 	// tile definitions
 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2, canChangeIcon: true) {
-			state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
-			state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
-			state "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
-			state "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+			state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0", nextState:"closing"
+			state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13", nextState:"opening"
+			state "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#ffe71e"
+			state "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffe71e"
 		}
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
@@ -50,11 +48,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 parse(String description) {
 	log.trace description
 	def result = null
@@ -83,13 +76,6 @@ def close() {
 	zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format()
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	refresh()
-}
-
 def refresh() {
 	zwave.switchBinaryV1.switchBinaryGet().format()
 }

devicetypes/smartthings/foscam.src/foscam.groovy

@@ -41,7 +41,7 @@
 
 		standardTile("take", "device.image", width: 1, height: 1, canChangeIcon: false, inactiveLabel: true, canChangeBackground: false) {
 			state "take", label: "Take", action: "Image Capture.take", icon: "st.camera.dropcam", backgroundColor: "#FFFFFF", nextState:"taking"
-			state "taking", label:'Taking', action: "", icon: "st.camera.dropcam", backgroundColor: "#00A0DC"
+			state "taking", label:'Taking', action: "", icon: "st.camera.dropcam", backgroundColor: "#53a7c0"
 			state "image", label: "Take", action: "Image Capture.take", icon: "st.camera.dropcam", backgroundColor: "#FFFFFF", nextState:"taking"
 		}
 

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

@@ -61,9 +61,9 @@ metadata {
     tiles(scale: 2) {
         multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
             tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-                attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00a0dc", nextState:"turningOff"
+                attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
                 attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
-                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00a0dc", nextState:"turningOff"
+                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
                 attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
             }
             tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -99,7 +99,7 @@ def parse(String description) {
 
 def poll() {
     def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh()
@@ -197,7 +197,7 @@ def off() {
 
 def refresh() {
     def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig()

devicetypes/smartthings/gentle-wake-up-controller.src/gentle-wake-up-controller.groovy

@@ -31,7 +31,7 @@ metadata {
             tileAttribute("sessionStatus", key: "PRIMARY_CONTROL") {
                 attributeState "cancelled", action: "timed session.start", icon: "http://f.cl.ly/items/322n181j2K3f281r2s0A/playbutton.png", backgroundColor: "#ffffff", nextState: "running"
                 attributeState "stopped", action: "timed session.start", icon: "http://f.cl.ly/items/322n181j2K3f281r2s0A/playbutton.png", backgroundColor: "#ffffff", nextState: "cancelled"
-                attributeState "running", action: "timed session.stop", icon: "http://f.cl.ly/items/0B3y3p2V3X2l3P3y3W09/stopbutton.png", backgroundColor: "#00A0DC", nextState: "cancelled"
+                attributeState "running", action: "timed session.stop", icon: "http://f.cl.ly/items/0B3y3p2V3X2l3P3y3W09/stopbutton.png", backgroundColor: "#79b821", nextState: "cancelled"
             }
             tileAttribute("timeRemaining", key: "SECONDARY_CONTROL") {
                 attributeState "timeRemaining", label:'${currentValue} remaining'
@@ -45,7 +45,7 @@ metadata {
         standardTile("sessionStatusTile", "sessionStatus", width: 1, height: 1, canChangeIcon: true) {
             state "cancelled", label: "Stopped", action: "timed session.start", backgroundColor: "#ffffff", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png"
             state "stopped", label: "Stopped", action: "timed session.start", backgroundColor: "#ffffff", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png"
-            state "running", label: "Running", action: "timed session.stop", backgroundColor: "#00A0DC", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png"
+            state "running", label: "Running", action: "timed session.stop", backgroundColor: "#79b821", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png"
         }
 
         // duration

devicetypes/smartthings/harmony-activity.src/harmony-activity.groovy

@@ -32,7 +32,7 @@ metadata {
 	tiles {
 		standardTile("button", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: 'Off', action: "switch.on", icon: "st.harmony.harmony-hub-icon", backgroundColor: "#ffffff", nextState: "on"
-			state "on", label: 'On', action: "switch.off", icon: "st.harmony.harmony-hub-icon", backgroundColor: "#00A0DC", nextState: "off"
+			state "on", label: 'On', action: "switch.off", icon: "st.harmony.harmony-hub-icon", backgroundColor: "#79b821", nextState: "off"
 		}
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"

devicetypes/smartthings/homeseer-multisensor.src/homeseer-multisensor.groovy

@@ -39,8 +39,8 @@ metadata {
 
 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
-			state "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC"
-			state "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc"
+			state "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
+			state "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false) {
 			state "temperature", label:'${currentValue}°',

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

@@ -17,7 +17,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 
 		command "setAdjustedColor"
         command "reset"
@@ -31,9 +30,9 @@ metadata {
 	tiles (scale: 2){
 		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -58,7 +57,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
 }
 
 // parse events into attributes

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

@@ -7,7 +7,6 @@
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Hue Bridge", namespace: "smartthings", author: "SmartThings") {
-		capability "Bridge"
 		capability "Health Check"
 
 		attribute "networkAddress", "string"
@@ -27,7 +26,7 @@ metadata {
      	multiAttributeTile(name:"rich-control"){
 			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
 				attributeState "Offline", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#ffffff"
-	            attributeState "Online", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#00A0DC"
+	            attributeState "Online", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#79b821"
 			}
 			}
 		valueTile("doNotRemove", "v", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
@@ -46,7 +45,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
 }
 
 // parse events into attributes

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

@@ -18,7 +18,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 
 		command "setAdjustedColor"
         command "reset"
@@ -32,9 +31,9 @@ metadata {
 	tiles (scale: 2){
 		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -67,7 +66,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
 }
 
 // parse events into attributes

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

@@ -14,8 +14,7 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
-		capability "Health Check"
-		capability "Light"
+        capability "Health Check"
 
         command "refresh"
 	}
@@ -27,9 +26,9 @@ metadata {
     tiles(scale: 2) {
         multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
             tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
               attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
               attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
             }
             tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -51,7 +50,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
 }
 
 // parse events into attributes

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

@@ -16,7 +16,6 @@ metadata {
         capability "Switch"
         capability "Refresh"
         capability "Health Check"
-        capability "Light"
 
         command "refresh"
     }
@@ -28,9 +27,9 @@ metadata {
     tiles (scale: 2){
         multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
             tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-                attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+                attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
                 attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
                 attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
             }
             tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -56,7 +55,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
 }
 
 // parse events into attributes

devicetypes/smartthings/life360-user.src/life360-user.groovy

@@ -29,7 +29,7 @@ metadata {
 
 	tiles {
 		standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
-			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#00A0DC")
+			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#53a7c0")
 			state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ffffff")
 		}
 

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

@@ -14,7 +14,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 	}
 
 	simulator {
@@ -24,9 +23,9 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'Turning off', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 

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

@@ -13,7 +13,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 	}
 
 	simulator {
@@ -23,9 +22,9 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'Turning off', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 

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

@@ -7,7 +7,6 @@ metadata {
 	definition (name: "Logitech Harmony Hub C2C", namespace: "smartthings", author: "SmartThings") {
 		capability "Media Controller"
         capability "Refresh"
-		capability "Health Check"
         
         command "activityoff"   
         command "alloff" 
@@ -39,16 +38,6 @@ metadata {
 	}
 }
 
-def installed() {
-	log.debug "installed()"
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "cloud", scheme:"untracked"]), displayed: false)
-}
-
-def updated() {
-	log.debug "updated()"
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "cloud", scheme:"untracked"]), displayed: false)
-}
-
 def startActivity(String activityId) {
 	log.debug "Executing 'Start Activity'"
 	log.trace parent.activity("$device.deviceNetworkId-$activityId","start")    
@@ -69,10 +58,6 @@ def poll() {
 	log.trace parent.poll()
 }
 
-def ping() {
-	refresh()
-}
-
 def refresh() {
 	log.debug "Executing 'Refresh'"
 	log.trace parent.poll()

devicetypes/smartthings/mimolite-garage-door-controller.src/mimolite-garage-door-controller.groovy

@@ -36,7 +36,6 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Contact Sensor"
-		capability "Light"
 
 		attribute "powered", "string"
 
@@ -54,11 +53,11 @@ metadata {
 	// UI tile definitions 
 	tiles {
         standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "doorClosed", label: "Closed", action: "on", icon: "st.doors.garage.garage-closed", backgroundColor: "#00A0DC"
-            state "doorOpen", label: "Open", action: "on", icon: "st.doors.garage.garage-open", backgroundColor: "#e86d13"
-            state "doorOpening", label: "Opening", action: "on", icon: "st.doors.garage.garage-opening", backgroundColor: "#e86d13"
-            state "doorClosing", label: "Closing", action: "on", icon: "st.doors.garage.garage-closing", backgroundColor: "#00A0DC"
-            state "on", label: "Actuate", action: "off", icon: "st.doors.garage.garage-closed", backgroundColor: "#00A0DC"
+			state "doorClosed", label: "Closed", action: "on", icon: "st.doors.garage.garage-closed", backgroundColor: "#79b821"
+            state "doorOpen", label: "Open", action: "on", icon: "st.doors.garage.garage-open", backgroundColor: "#ffa81e"
+            state "doorOpening", label: "Opening", action: "on", icon: "st.doors.garage.garage-opening", backgroundColor: "#ffa81e"
+            state "doorClosing", label: "Closing", action: "on", icon: "st.doors.garage.garage-closing", backgroundColor: "#ffa81e"
+            state "on", label: "Actuate", action: "off", icon: "st.doors.garage.garage-closed", backgroundColor: "#53a7c0"
 			state "off", label: '${name}', action: "on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
         }
         standardTile("contact", "device.contact", inactiveLabel: false) {

devicetypes/smartthings/mobile-presence.src/mobile-presence.groovy

@@ -27,8 +27,8 @@ metadata {
 
 	tiles {
 		standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
-			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#00A0DC")
-			state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ffffff")
+			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#53a7c0")
+			state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ebeef2")
 		}
 		main "presence"
 		details "presence"

devicetypes/smartthings/momentary-button-tile.src/momentary-button-tile.groovy

@@ -32,7 +32,7 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: 'Push', action: "momentary.push", backgroundColor: "#ffffff", nextState: "on"
-			state "on", label: 'Push', action: "momentary.push", backgroundColor: "#00A0DC"
+			state "on", label: 'Push', action: "momentary.push", backgroundColor: "#53a7c0"
 		}
 		main "switch"
 		details "switch"

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

@@ -28,8 +28,8 @@ metadata {
 	// UI tile definitions
 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
+			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
 		}
 
 		main "motion"

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

@@ -21,7 +21,6 @@ metadata {
 		capability "Configuration"
 		capability "Battery"
 		capability "Refresh"
-		capability "Sensor"
         
         command "enrollResponse"
 
@@ -32,8 +31,8 @@ metadata {
 
 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
+			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
 		}
         
          valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false) {

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

@@ -24,7 +24,6 @@ metadata {
 		capability "Contact Sensor"
 		capability "Refresh"
 		capability "Health Check"
-		capability "Sensor"
 
 		command "enrollResponse"
 
@@ -42,8 +41,8 @@ metadata {
 
 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#e86d13")
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#00a0dc")
+			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
+			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
 		}
 
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false) {

devicetypes/smartthings/on-off-button-tile.src/on-off-button-tile.groovy

@@ -31,7 +31,7 @@ metadata {
 	tiles {
 		standardTile("button", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: 'Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "on"
-			state "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC", nextState: "off"
+			state "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "off"
 		}
 		main "button"
 		details "button"

devicetypes/smartthings/on-off-shield.src/on-off-shield.groovy

@@ -31,7 +31,7 @@ metadata {
 	// UI tile definitions
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 		}
 

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

@@ -29,8 +29,8 @@ metadata {
 	// UI tile definitions
 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#e86d13"
-			state "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#00A0DC"
+			state "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#ffa81e"
+			state "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#79b821"
 		}
 
 		main "contact"
@@ -40,11 +40,14 @@ metadata {
 
 // Parse incoming device messages to generate events
 def parse(String description) {
-	def resMap
-	if (description.startsWith("zone")) {
-		resMap = createEvent(name: "contact", value: zigbee.parseZoneStatus(description).isAlarm1Set() ? "open" : "closed")
+	def name = null
+	def value = description
+	if (zigbee.isZoneType19(description)) {
+		name = "contact"
+		value = zigbee.translateStatusZoneType19(description) ? "open" : "closed"
 	}
 	
-	log.debug "Parse returned $resMap"
-	return resMap
+	def result = createEvent(name: name, value: value)
+	log.debug "Parse returned ${result?.descriptionText}"
+	return result
 }

devicetypes/smartthings/plant-link.src/.st-ignore

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

devicetypes/smartthings/plant-link.src/README.md

@@ -1,35 +0,0 @@
-# Plant Link
-
-Cloud Execution
-
-Works with: 
-
-* [OSO Technologies PlantLink Soil Moisture Sensor](https://www.smartthings.com/works-with-smartthings/oso-technologies/oso-technologies-plantlink-soil-moisture-sensor)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Troubleshooting](#troubleshooting)
-
-## Capabilities
-
-* **Relative Humidity Measurement** - allows reading the relative humidity from devices that support it
-* **Sensor** - detects sensor events
-* **Battery** - defines device uses a battery
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-Plant Link sensor is a Z-wave sleepy device and checks in every 15 minutes.
-Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*15 + 2)mins = 32 mins.
-
-* __32min__ checkInterval
-
-## Troubleshooting
-
-If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
-Pairing needs to be tried again by placing the sensor closer to the hub.
-Instructions related to pairing, resetting and removing the different motion sensors from SmartThings can be found in the following links
-for the different models:
-* [OSO Technologies PlantLink Soil Moisture Sensor Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206868986-PlantLink-Soil-Moisture-Sensor)

devicetypes/smartthings/plant-link.src/plant-link.groovy

@@ -21,10 +21,8 @@ metadata {
 		capability "Relative Humidity Measurement"
 		capability "Battery"
 		capability "Sensor"
-		capability "Health Check"
 
 		fingerprint profileId: "0104", inClusters: "0000,0003,0405,FC08", outClusters: "0003"
-		fingerprint endpoint: "1", profileId: "0104", inClusters: "0000,0001,0003,0B04", outClusters: "0003", manufacturer: "", model: "", deviceJoinName: "OSO Technologies PlantLink Soil Moisture Sensor"
 	}
 
 	tiles {
@@ -50,11 +48,6 @@ metadata {
 	}
 }
 
-def updated() {
-	// Device-Watch allows 2 check-in misses from device
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
-
 // Parse incoming device messages to generate events
 def parse(String description) {
 	log.debug "Parse description $description"

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

@@ -37,9 +37,9 @@ metadata {
 	}
 
 	standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-		state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff"
+		state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 		state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-		state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff"
+		state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 		state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 	}
 	standardTile("reset", "device.reset", inactiveLabel: false, decoration: "flat") {

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

@@ -42,9 +42,9 @@ metadata {
 
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 		}
 		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 3, inactiveLabel: false) {

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

@@ -16,7 +16,7 @@
  *  Date: 2013-03-05
  */
 metadata {
-	definition (name: "SmartAlert Siren", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.smokedetector") {
+	definition (name: "SmartAlert Siren", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Switch"
 		capability "Sensor"

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

@@ -16,7 +16,7 @@
  *	Date: 2013-12-04
  */
 metadata {
-	definition (name: "SmartPower Dimming Outlet", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.smartplug") {
+	definition (name: "SmartPower Dimming Outlet", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch"
 		capability "Switch Level"
 		capability "Power Meter"
@@ -24,7 +24,6 @@ metadata {
 		capability "Refresh"
 		capability "Actuator"
 		capability "Sensor"
-		capability "Outlet"
 
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-ZHAC"
 
@@ -70,36 +69,288 @@ metadata {
 def parse(String description) {
 	log.debug "description is $description"
 
-	def event = zigbee.getEvent(description)
-	if (!event) {
-		log.warn "DID NOT PARSE MESSAGE for description : $description"
-		log.debug zigbee.parseDescriptionAsMap(description)
-	} else if (event.name == "power") {
-		/*
-			Dividing by 10 as the Divisor is 10000 and unit is kW for the device. Simplifying to 10 power level is an integer.
-		*/
-		event.value = event.value / 10
-	}
+	def event = [:]
+	def finalResult = isKnownDescription(description)
+	if (finalResult) {
+		log.info finalResult
+		if (finalResult.type == "update") {
+			log.info "$device updates: ${finalResult.value}"
+			event = null
+		}
+		else if (finalResult.type == "power") {
+			def powerValue = (finalResult.value as Integer)/10
+			event = createEvent(name: "power", value: powerValue)
 
-	return event ? createEvent(event) : event
+			/*
+				Dividing by 10 as the Divisor is 10000 and unit is kW for the device. AttrId: 0302 and 0300. Simplifying to 10
+
+				power level is an integer. The exact power level with correct units needs to be handled in the device type
+				to account for the different Divisor value (AttrId: 0302) and POWER Unit (AttrId: 0300). CLUSTER for simple metering is 0702
+			*/
+		}
+		else {
+			event = createEvent(name: finalResult.type, value: finalResult.value)
+		}
+	}
+	else {
+		log.warn "DID NOT PARSE MESSAGE for description : $description"
+		log.debug parseDescriptionAsMap(description)
+	}
+	return event
 }
 
-def setLevel(value) {
-	zigbee.setLevel(value)
+// Commands to device
+def zigbeeCommand(cluster, attribute){
+	"st cmd 0x${device.deviceNetworkId} ${endpointId} ${cluster} ${attribute} {}"
 }
 
 def off() {
-	zigbee.off()
+	zigbeeCommand("6", "0")
 }
 
 def on() {
-	zigbee.on()
+	zigbeeCommand("6", "1")
+}
+
+def setLevel(value) {
+	value = value as Integer
+	if (value == 0) {
+		off()
+	}
+	else {
+		if (device.latestValue("switch") == "off") {
+			sendEvent(name: "switch", value: "on")
+		}
+		sendEvent(name: "level", value: value)
+		setLevelWithRate(value, "0000")		//value is between 0 to 100
+	}
 }
 
 def refresh() {
-	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.electricMeasurementPowerRefresh()
+	[
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 500",
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 500",
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 500"
+	]
+
 }
 
 def configure() {
-	refresh() + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.electricMeasurementPowerConfig()
+	refresh() + onOffConfig() + levelConfig() + powerConfig()
+}
+
+
+private getEndpointId() {
+	new BigInteger(device.endpointId, 16).toString()
+}
+
+private hex(value, width=2) {
+	def s = new BigInteger(Math.round(value).toString()).toString(16)
+	while (s.size() < width) {
+		s = "0" + s
+	}
+	s
+}
+
+private String swapEndianHex(String hex) {
+	reverseArray(hex.decodeHex()).encodeHex()
+}
+
+private Integer convertHexToInt(hex) {
+	Integer.parseInt(hex,16)
+}
+
+//Need to reverse array of size 2
+private byte[] reverseArray(byte[] array) {
+	byte tmp;
+	tmp = array[1];
+	array[1] = array[0];
+	array[0] = tmp;
+	return array
+}
+
+def parseDescriptionAsMap(description) {
+	if (description?.startsWith("read attr -")) {
+		(description - "read attr - ").split(",").inject([:]) { map, param ->
+			def nameAndValue = param.split(":")
+			map += [(nameAndValue[0].trim()): nameAndValue[1].trim()]
+		}
+	}
+	else if (description?.startsWith("catchall: ")) {
+		def seg = (description - "catchall: ").split(" ")
+		def zigbeeMap = [:]
+		zigbeeMap += [raw: (description - "catchall: ")]
+		zigbeeMap += [profileId: seg[0]]
+		zigbeeMap += [clusterId: seg[1]]
+		zigbeeMap += [sourceEndpoint: seg[2]]
+		zigbeeMap += [destinationEndpoint: seg[3]]
+		zigbeeMap += [options: seg[4]]
+		zigbeeMap += [messageType: seg[5]]
+		zigbeeMap += [dni: seg[6]]
+		zigbeeMap += [isClusterSpecific: Short.valueOf(seg[7], 16) != 0]
+		zigbeeMap += [isManufacturerSpecific: Short.valueOf(seg[8], 16) != 0]
+		zigbeeMap += [manufacturerId: seg[9]]
+		zigbeeMap += [command: seg[10]]
+		zigbeeMap += [direction: seg[11]]
+		zigbeeMap += [data: seg.size() > 12 ? seg[12].split("").findAll { it }.collate(2).collect {
+			it.join('')
+		} : []]
+
+		zigbeeMap
+	}
+}
+
+def isKnownDescription(description) {
+	if ((description?.startsWith("catchall:")) || (description?.startsWith("read attr -"))) {
+		def descMap = parseDescriptionAsMap(description)
+		if (descMap.cluster == "0006" || descMap.clusterId == "0006") {
+			isDescriptionOnOff(descMap)
+		}
+		else if (descMap.cluster == "0008" || descMap.clusterId == "0008"){
+			isDescriptionLevel(descMap)
+		}
+		else if (descMap.cluster == "0B04" || descMap.clusterId == "0B04"){
+			isDescriptionPower(descMap)
+		}
+		else {
+			return [:]
+		}
+	}
+	else if(description?.startsWith("on/off:")) {
+		def switchValue = description?.endsWith("1") ? "on" : "off"
+		return	[type: "switch", value : switchValue]
+	}
+	else {
+		return [:]
+	}
+}
+
+def isDescriptionOnOff(descMap) {
+	def switchValue = "undefined"
+	if (descMap.cluster == "0006") {				//cluster info from read attr
+		value = descMap.value
+		if (value == "01"){
+			switchValue = "on"
+		}
+		else if (value == "00"){
+			switchValue = "off"
+		}
+	}
+	else if (descMap.clusterId == "0006") {
+		//cluster info from catch all
+		//command 0B is Default response and the last two bytes are [on/off][success]. on/off=00, success=00
+		//command 01 is Read attr response. the last two bytes are [datatype][value]. boolean datatype=10; on/off value = 01/00
+		if ((descMap.command=="0B" && descMap.raw.endsWith("0100")) || (descMap.command=="01" && descMap.raw.endsWith("1001"))){
+			switchValue = "on"
+		}
+		else if ((descMap.command=="0B" && descMap.raw.endsWith("0000")) || (descMap.command=="01" && descMap.raw.endsWith("1000"))){
+			switchValue = "off"
+		}
+		else if(descMap.command=="07"){
+			return	[type: "update", value : "switch (0006) capability configured successfully"]
+		}
+	}
+
+	if (switchValue != "undefined"){
+		return	[type: "switch", value : switchValue]
+	}
+	else {
+		return [:]
+	}
+
+}
+
+//@return - false or "success" or level [0-100]
+def isDescriptionLevel(descMap) {
+	def dimmerValue = -1
+	if (descMap.cluster == "0008"){
+		//TODO: the message returned with catchall is command 0B with clusterId 0008. That is just a confirmation message
+		def value = convertHexToInt(descMap.value)
+		dimmerValue = Math.round(value * 100 / 255)
+		if(dimmerValue==0 && value > 0) {
+			dimmerValue = 1						//handling for non-zero hex value less than 3
+		}
+	}
+	else if(descMap.clusterId == "0008") {
+		if(descMap.command=="0B"){
+			return	[type: "update", value : "level updated successfully"]					//device updating the level change was successful. no value sent.
+		}
+		else if(descMap.command=="07"){
+			return	[type: "update", value : "level (0008) capability configured successfully"]
+		}
+	}
+
+	if (dimmerValue != -1){
+		return	[type: "level", value : dimmerValue]
+	}
+	else {
+		return [:]
+	}
+}
+
+def isDescriptionPower(descMap) {
+	def powerValue = "undefined"
+	if (descMap.cluster == "0B04") {
+		if (descMap.attrId == "050b") {
+			if(descMap.value!="ffff")
+				powerValue = convertHexToInt(descMap.value)
+		}
+	}
+	else if (descMap.clusterId == "0B04") {
+		if(descMap.command=="07"){
+			return	[type: "update", value : "power (0B04) capability configured successfully"]
+		}
+	}
+
+	if (powerValue != "undefined"){
+		return	[type: "power", value : powerValue]
+	}
+	else {
+		return [:]
+	}
+}
+
+
+def onOffConfig() {
+	[
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 200",
+			"zcl global send-me-a-report 6 0 0x10 0 600 {01}",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
+	]
+}
+
+//level config for devices with min reporting interval as 5 seconds and reporting interval if no activity as 1hour (3600s)
+//min level change is 01
+def levelConfig() {
+	[
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 200",
+			"zcl global send-me-a-report 8 0 0x20 5 3600 {01}",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
+	]
+}
+
+//power config for devices with min reporting interval as 1 seconds and reporting interval if no activity as 10min (600s)
+//min change in value is 05
+def powerConfig() {
+	[
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
+		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
+	]
+}
+
+def setLevelWithRate(level, rate) {
+	if(rate == null){
+		rate = "0000"
+	}
+	level = convertToHexString(level * 255 / 100) 				//Converting the 0-100 range to 0-FF range in hex
+	"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}"
+}
+
+String convertToHexString(value, width=2) {
+	def s = new BigInteger(Math.round(value).toString()).toString(16)
+	while (s.size() < width) {
+		s = "0" + s
+	}
+	s
 }

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

@@ -4,7 +4,6 @@ metadata {
 		capability "Actuator"
 		capability "Switch"
 		capability "Sensor"
-		capability "Outlet"
 
 		fingerprint profileId: "0104", inClusters: "0006, 0004, 0003, 0000, 0005", outClusters: "0019", manufacturer: "Compacta International, Ltd", model: "ZBMPlug15", deviceJoinName: "SmartPower Outlet V1"
 	}
@@ -24,7 +23,7 @@ metadata {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
 				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
-				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			}
 		}
 		main "switch"
@@ -52,7 +51,7 @@ def on() {
 			'zcl on-off on',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 2000'
+			'delay 500'
 
 	]
 
@@ -63,6 +62,6 @@ def off() {
 			'zcl on-off off',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 2000'
+			'delay 500'
 	]
 }