Merge pull request #1143 from SmartThingsCommunity/staging

Rolling up changes to production for deploy

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

@@ -29,6 +29,7 @@ metadata {
 		attribute "powerSupply", "enum", ["USB Cable", "Battery"]
 
 		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A", outClusters: "0x5A"
+		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A,0x5A"
 	}
 
 	simulator {
@@ -328,7 +329,7 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 
 def configure() {
 	// allow device user configured or default 16 min to check in; double the periodic reporting interval
-	sendEvent(name: "checkInterval", value: 2* timeOptionValueMap[reportInterval] ?: 2*8*60, displayed: false)
+	sendEvent(name: "checkInterval", value: 2* (timeOptionValueMap[reportInterval] ?: (2*8*60)), displayed: false)
 
 	// This sensor joins as a secure device if you double-click the button to include it
 	log.debug "${device.displayName} is configuring its settings"
@@ -356,7 +357,7 @@ def configure() {
 									motionSensitivity == "minimum" ? 0 : 64)
 
 	//5. report every x minutes (threshold reports don't work on battery power, default 8 mins)
-	request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: 8*60) //association group 1
+	request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: (8*60)) //association group 1
 
 	request << zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 6*60*60)  //association group 2
 

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

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

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

@@ -21,7 +21,9 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 
-		fingerprint inClusters: "0x26"
+		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
+		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
+		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "Z-Wave Plug-In Dimmer"
 	}
 
 	simulator {
@@ -42,6 +44,10 @@ metadata {
 		reply "200163,delay 5000,2602": "command: 2603, payload: 63"
 	}
 
+	preferences {
+		input "ledIndicator", "enum", title: "LED Indicator", description: "Turn LED indicator... ", required: false, options:["on": "When On", "off": "When Off", "never": "Never"], defaultValue: "off"
+	}
+
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
@@ -70,11 +76,28 @@ metadata {
 		}
 
 		main(["switch"])
-		details(["switch", "level", "indicator", "refresh"])
+		details(["switch", "level", "refresh"])
 
 	}
 }
 
+def updated(){
+  switch (ledIndicator) {
+        case "on":
+            indicatorWhenOn()
+            break
+        case "off":
+            indicatorWhenOff()
+            break
+        case "never":
+            indicatorNever()
+            break
+        default:
+            indicatorWhenOn()
+            break
+    }
+}
+
 def parse(String description) {
 	def result = null
 	if (description != "updated") {
@@ -202,19 +225,19 @@ def refresh() {
 	delayBetween(commands,100)
 }
 
-def indicatorWhenOn() {
-	sendEvent(name: "indicatorStatus", value: "when on")
-	zwave.configurationV1.configurationSet(configurationValue: [1], parameterNumber: 3, size: 1).format()
+void indicatorWhenOn() {
+	sendEvent(name: "indicatorStatus", value: "when on", display: false)
+	sendHubCommand(new physicalgraph.device.HubAction(zwave.configurationV1.configurationSet(configurationValue: [1], parameterNumber: 3, size: 1).format()))
 }
 
-def indicatorWhenOff() {
-	sendEvent(name: "indicatorStatus", value: "when off")
-	zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 3, size: 1).format()
+void indicatorWhenOff() {
+	sendEvent(name: "indicatorStatus", value: "when off", display: false)
+	sendHubCommand(new physicalgraph.device.HubAction(zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 3, size: 1).format()))
 }
 
-def indicatorNever() {
-	sendEvent(name: "indicatorStatus", value: "never")
-	zwave.configurationV1.configurationSet(configurationValue: [2], parameterNumber: 3, size: 1).format()
+void indicatorNever() {
+	sendEvent(name: "indicatorStatus", value: "never", display: false)
+	sendHubCommand(new physicalgraph.device.HubAction(zwave.configurationV1.configurationSet(configurationValue: [2], parameterNumber: 3, size: 1).format()))
 }
 
 def invertSwitch(invert=true) {
@@ -224,4 +247,4 @@ def invertSwitch(invert=true) {
 	else {
 		zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 4, size: 1).format()
 	}
-}
+}

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

@@ -43,7 +43,7 @@ metadata {
 		}
 
 		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
+			state "default", label:"Reset To White", action:"reset", icon:"st.lights.philips.hue-single"
 		}
 
 		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
@@ -51,7 +51,7 @@ metadata {
 		}
 
 		main(["rich-control"])
-		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
+		details(["rich-control", "reset", "refresh"])
 	}
 }
 
@@ -75,118 +75,78 @@ def parse(description) {
 // handle commands
 void on() {
 	log.trace parent.on(this)
-	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
 	log.trace parent.off(this)
-	sendEvent(name: "switch", value: "off")
-}
-
-void nextLevel() {
-	def level = device.latestValue("level") as Integer ?: 0
-	if (level <= 100) {
-		level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
-	}
-	else {
-		level = 25
-	}
-	setLevel(level)
 }
 
 void setLevel(percent) {
     log.debug "Executing 'setLevel'"
     if (verifyPercent(percent)) {
-        parent.setLevel(this, percent)
-        sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
-        sendEvent(name: "switch", value: "on")
+	    log.trace parent.setLevel(this, percent)
     }
 }
 
 void setSaturation(percent) {
     log.debug "Executing 'setSaturation'"
     if (verifyPercent(percent)) {
-        parent.setSaturation(this, percent)
-        sendEvent(name: "saturation", value: percent, displayed: false)
+	    log.trace parent.setSaturation(this, percent)
     }
 }
 
 void setHue(percent) {
     log.debug "Executing 'setHue'"
     if (verifyPercent(percent)) {
-        parent.setHue(this, percent)
-        sendEvent(name: "hue", value: percent, displayed: false)
+	    log.trace parent.setHue(this, percent)
     }
 }
 
 void setColor(value) {
-    log.debug "setColor: ${value}, $this"
     def events = []
     def validValues = [:]
 
     if (verifyPercent(value.hue)) {
-        events << createEvent(name: "hue", value: value.hue, displayed: false)
         validValues.hue = value.hue
     }
     if (verifyPercent(value.saturation)) {
-        events << createEvent(name: "saturation", value: value.saturation, displayed: false)
         validValues.saturation = value.saturation
     }
     if (value.hex != null) {
         if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
-            events << createEvent(name: "color", value: value.hex)
             validValues.hex = value.hex
         } else {
             log.warn "$value.hex is not a valid color"
         }
     }
     if (verifyPercent(value.level)) {
-        events << createEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")
         validValues.level = value.level
     }
     if (value.switch == "off" || (value.level != null && value.level <= 0)) {
-        events << createEvent(name: "switch", value: "off")
         validValues.switch = "off"
     } else {
-        events << createEvent(name: "switch", value: "on")
         validValues.switch = "on"
     }
-    if (!events.isEmpty()) {
-        parent.setColor(this, validValues)
-    }
-    events.each {
-        sendEvent(it)
+    if (!validValues.isEmpty()) {
+	    log.trace parent.setColor(this, validValues)
     }
 }
 
 void reset() {
     log.debug "Executing 'reset'"
-    def value = [level:100, saturation:56, hue:23]
-    setAdjustedColor(value)
-    parent.poll()
+	def value = [hue:20, saturation:2]
+	setAdjustedColor(value)
 }
 
 void setAdjustedColor(value) {
     if (value) {
         log.trace "setAdjustedColor: ${value}"
         def adjusted = value + [:]
-        adjusted.hue = adjustOutgoingHue(value.hue)
         // Needed because color picker always sends 100
         adjusted.level = null
-        setColor(adjusted)
+	    setColor(adjusted)
     } else {
-        log.warn "Invalid color input"
-    }
-}
-
-void setColorTemperature(value) {
-    if (value) {
-        log.trace "setColorTemperature: ${value}k"
-        parent.setColorTemperature(this, value)
-        sendEvent(name: "colorTemperature", value: value)
-        sendEvent(name: "switch", value: "on")
-    } else {
-        log.warn "Invalid color temperature"
+        log.warn "Invalid color input $value"
     }
 }
 
@@ -195,22 +155,6 @@ void refresh() {
     parent.manualRefresh()
 }
 
-def adjustOutgoingHue(percent) {
-	def adjusted = percent
-	if (percent > 31) {
-		if (percent < 63.0) {
-			adjusted = percent + (7 * (percent -30 ) / 32)
-		}
-		else if (percent < 73.0) {
-			adjusted = 69 + (5 * (percent - 62) / 10)
-		}
-		else {
-			adjusted = percent + (2 * (100 - percent) / 28)
-		}
-	}
-	log.info "percent: $percent, adjusted: $adjusted"
-	adjusted
-}
 
 def verifyPercent(percent) {
     if (percent == null)

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

@@ -7,8 +7,13 @@
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Hue Bridge", namespace: "smartthings", author: "SmartThings") {
-		attribute "serialNumber", "string"
 		attribute "networkAddress", "string"
+        // Used to indicate if bridge is reachable or not, i.e. is the bridge connected to the network
+        // Possible values "Online" or "Offline"
+		attribute "status", "string"
+		// Id is the number on the back of the hub, Hue uses last six digits of Mac address
+		// This is also used in the Hue application as ID
+		attribute "idNumber", "string"
 	}
 
 	simulator {
@@ -17,22 +22,23 @@ metadata {
 
 	tiles(scale: 2) {
      	multiAttributeTile(name:"rich-control"){
-			tileAttribute ("", key: "PRIMARY_CONTROL") {
-	            attributeState "default", label: "Hue Bridge", action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#F3C200"
+			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: "#79b821"
 			}
-	        tileAttribute ("serialNumber", key: "SECONDARY_CONTROL") {
-	            attributeState "default", label:'SN: ${currentValue}'
 			}
+		valueTile("doNotRemove", "v", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
+			state "default", label:'Do not remove'
         }
-		valueTile("serialNumber", "device.serialNumber", decoration: "flat", height: 1, width: 2, inactiveLabel: false) {
-			state "default", label:'SN: ${currentValue}'
+		valueTile("idNumber", "device.idNumber", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
+			state "default", label:'ID: ${currentValue}'
 		}
-		valueTile("networkAddress", "device.networkAddress", decoration: "flat", height: 2, width: 4, inactiveLabel: false) {
-			state "default", label:'${currentValue}', height: 1, width: 2, inactiveLabel: false
+		valueTile("networkAddress", "device.networkAddress", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
+			state "default", label:'IP: ${currentValue}'
 		}
 
 		main (["rich-control"])
-		details(["rich-control", "networkAddress"])
+		details(["rich-control", "idNumber", "networkAddress", "doNotRemove"])
 	}
 }
 

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

@@ -43,16 +43,16 @@ metadata {
 			}
 		}
 
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
-            state "colorTemperature", action:"color temperature.setColorTemperature"
-        }
+    controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+        state "colorTemperature", action:"color temperature.setColorTemperature"
+    }
 
-        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: '${currentValue} K'
-        }
+    valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        state "colorTemperature", label: 'WHITES'
+    }
 
 		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
+			state "default", label:"Reset To White", action:"reset", icon:"st.lights.philips.hue-single"
 		}
 
 		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
@@ -84,118 +84,86 @@ def parse(description) {
 // handle commands
 void on() {
 	log.trace parent.on(this)
-	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
 	log.trace parent.off(this)
-	sendEvent(name: "switch", value: "off")
-}
-
-void nextLevel() {
-	def level = device.latestValue("level") as Integer ?: 0
-	if (level <= 100) {
-		level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
-	}
-	else {
-		level = 25
-	}
-	setLevel(level)
 }
 
 void setLevel(percent) {
     log.debug "Executing 'setLevel'"
     if (verifyPercent(percent)) {
-        parent.setLevel(this, percent)
-        sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
-        sendEvent(name: "switch", value: "on")
+	    log.trace parent.setLevel(this, percent)
     }
 }
 
 void setSaturation(percent) {
     log.debug "Executing 'setSaturation'"
     if (verifyPercent(percent)) {
-        parent.setSaturation(this, percent)
-        sendEvent(name: "saturation", value: percent, displayed: false)
+	    log.trace parent.setSaturation(this, percent)
     }
 }
 
 void setHue(percent) {
     log.debug "Executing 'setHue'"
     if (verifyPercent(percent)) {
-        parent.setHue(this, percent)
-        sendEvent(name: "hue", value: percent, displayed: false)
+	    log.trace parent.setHue(this, percent)
     }
 }
 
 void setColor(value) {
-    log.debug "setColor: ${value}, $this"
     def events = []
     def validValues = [:]
 
     if (verifyPercent(value.hue)) {
-        events << createEvent(name: "hue", value: value.hue, displayed: false)
         validValues.hue = value.hue
     }
     if (verifyPercent(value.saturation)) {
-        events << createEvent(name: "saturation", value: value.saturation, displayed: false)
         validValues.saturation = value.saturation
     }
     if (value.hex != null) {
         if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
-            events << createEvent(name: "color", value: value.hex)
             validValues.hex = value.hex
         } else {
             log.warn "$value.hex is not a valid color"
         }
     }
     if (verifyPercent(value.level)) {
-        events << createEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")
         validValues.level = value.level
     }
     if (value.switch == "off" || (value.level != null && value.level <= 0)) {
-        events << createEvent(name: "switch", value: "off")
         validValues.switch = "off"
     } else {
-        events << createEvent(name: "switch", value: "on")
         validValues.switch = "on"
     }
-    if (!events.isEmpty()) {
-        parent.setColor(this, validValues)
-    }
-    events.each {
-        sendEvent(it)
+    if (!validValues.isEmpty()) {
+	    log.trace parent.setColor(this, validValues)
     }
 }
 
 void reset() {
     log.debug "Executing 'reset'"
-    def value = [level:100, saturation:56, hue:23]
-    setAdjustedColor(value)
-    parent.poll()
+	setColorTemperature(4000)
 }
 
 void setAdjustedColor(value) {
     if (value) {
         log.trace "setAdjustedColor: ${value}"
         def adjusted = value + [:]
-        adjusted.hue = adjustOutgoingHue(value.hue)
         // Needed because color picker always sends 100
         adjusted.level = null
-        setColor(adjusted)
+	    setColor(adjusted)
     } else {
-        log.warn "Invalid color input"
+        log.warn "Invalid color input $value"
     }
 }
 
 void setColorTemperature(value) {
     if (value) {
         log.trace "setColorTemperature: ${value}k"
-        parent.setColorTemperature(this, value)
-        sendEvent(name: "colorTemperature", value: value)
-        sendEvent(name: "switch", value: "on")
+	    log.trace parent.setColorTemperature(this, value)
     } else {
-        log.warn "Invalid color temperature"
+        log.warn "Invalid color temperature $value"
     }
 }
 
@@ -204,23 +172,6 @@ void refresh() {
     parent.manualRefresh()
 }
 
-def adjustOutgoingHue(percent) {
-	def adjusted = percent
-	if (percent > 31) {
-		if (percent < 63.0) {
-			adjusted = percent + (7 * (percent -30 ) / 32)
-		}
-		else if (percent < 73.0) {
-			adjusted = 69 + (5 * (percent - 62) / 10)
-		}
-		else {
-			adjusted = percent + (2 * (100 - percent) / 28)
-		}
-	}
-	log.info "percent: $percent, adjusted: $adjusted"
-	adjusted
-}
-
 def verifyPercent(percent) {
     if (percent == null)
         return false

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

@@ -68,20 +68,16 @@ def parse(description) {
 // handle commands
 void on() {
 	log.trace parent.on(this)
-	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
 	log.trace parent.off(this)
-	sendEvent(name: "switch", value: "off")
 }
 
 void setLevel(percent) {
 	log.debug "Executing 'setLevel'"
     if (percent != null && percent >= 0 && percent <= 100) {
 		parent.setLevel(this, percent)
-		sendEvent(name: "level", value: percent)
-		sendEvent(name: "switch", value: "on")
 	} else {
     	log.warn "$percent is not 0-100"
     }

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

@@ -36,12 +36,12 @@ metadata {
             }
         }
 
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2200..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
 
         valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: '${currentValue} K'
+            state "colorTemperature", label: 'WHITES'
         }
 
         standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
@@ -73,20 +73,16 @@ def parse(description) {
 // handle commands
 void on() {
     log.trace parent.on(this)
-    sendEvent(name: "switch", value: "on")
 }
 
 void off() {
     log.trace parent.off(this)
-    sendEvent(name: "switch", value: "off")
 }
 
 void setLevel(percent) {
     log.debug "Executing 'setLevel'"
     if (percent != null && percent >= 0 && percent <= 100) {
-        parent.setLevel(this, percent)
-        sendEvent(name: "level", value: percent)
-        sendEvent(name: "switch", value: "on")
+        log.trace parent.setLevel(this, percent)
     } else {
         log.warn "$percent is not 0-100"
     }
@@ -95,9 +91,7 @@ void setLevel(percent) {
 void setColorTemperature(value) {
     if (value) {
         log.trace "setColorTemperature: ${value}k"
-        parent.setColorTemperature(this, value)
-        sendEvent(name: "colorTemperature", value: value)
-        sendEvent(name: "switch", value: "on")
+        log.trace parent.setColorTemperature(this, value)
     } else {
         log.warn "Invalid color temperature"
     }
@@ -107,4 +101,3 @@ void refresh() {
     log.debug "Executing 'refresh'"
     parent.manualRefresh()
 }
-

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

@@ -22,6 +22,7 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Water Sensor"
 		capability "Health Check"
+		capability "Sensor"		
 
 		command "enrollResponse"
 
@@ -255,7 +256,8 @@ private Map getBatteryResult(rawValue) {
 				def minVolts = 2.1
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
-				result.value = Math.min(100, (int) pct * 100)
+				def roundedPct = Math.round(pct * 100)
+				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}

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

@@ -22,6 +22,7 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Refresh"
 		capability "Health Check"
+		capability "Sensor"		
 
 		command "enrollResponse"
 
@@ -271,7 +272,8 @@ private Map getBatteryResult(rawValue) {
 				def minVolts = 2.1
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
-				result.value = Math.min(100, (int) pct * 100)
+				def roundedPct = Math.round(pct * 100)
+				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}

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

@@ -24,7 +24,7 @@ metadata {
         capability "Temperature Measurement"
 		capability "Refresh"
 		capability "Sensor"
-        
+
         command "enrollResponse"
 
 	}
@@ -73,7 +73,7 @@ metadata {
 
 def parse(String description) {
 	log.debug "description: $description"
-    
+
 	Map map = [:]
 	if (description?.startsWith('catchall:')) {
 		map = parseCatchAllMessage(description)
@@ -87,10 +87,10 @@ def parse(String description) {
     else if (description?.startsWith('zone status')) {
 	    map = parseIasMessage(description)
     }
- 
+
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
-    
+
     if (description?.startsWith('enroll request')) {
     	List cmds = enrollResponse()
         log.debug "enroll response: ${cmds}"
@@ -128,7 +128,7 @@ private Map parseCatchAllMessage(String description) {
 private boolean shouldProcessMessage(cluster) {
     // 0x0B is default response indicating message got through
     // 0x07 is bind message
-    boolean ignoredMessage = cluster.profileId != 0x0104 || 
+    boolean ignoredMessage = cluster.profileId != 0x0104 ||
         cluster.command == 0x0B ||
         cluster.command == 0x07 ||
         (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
@@ -141,7 +141,7 @@ private Map parseReportAttributeMessage(String description) {
 		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
 	}
 	log.debug "Desc Map: $descMap"
- 
+
 	Map resultMap = [:]
 	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
 		def value = getTemperature(descMap.value)
@@ -153,11 +153,11 @@ private Map parseReportAttributeMessage(String description) {
     else if (descMap.cluster == "0406" && descMap.attrId == "0000") {
     	def value = descMap.value.endsWith("01") ? "active" : "inactive"
     	resultMap = getMotionResult(value)
-    } 
- 
+    }
+
 	return resultMap
 }
- 
+
 private Map parseCustomMessage(String description) {
 	Map resultMap = [:]
 	if (description?.startsWith('temperature: ')) {
@@ -170,7 +170,7 @@ private Map parseCustomMessage(String description) {
 private Map parseIasMessage(String description) {
     List parsedMsg = description.split(' ')
     String msgCode = parsedMsg[2]
-    
+
     Map resultMap = [:]
     switch(msgCode) {
         case '0x0020': // Closed/No Motion/Dry
@@ -240,7 +240,8 @@ private Map getBatteryResult(rawValue) {
 			def minVolts = 2.1
 			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			result.value = Math.min(100, (int) pct * 100)
+			def roundedPct = Math.round(pct * 100)
+			result.value = Math.min(100, roundedPct)
 			result.descriptionText = "${linkText} battery was ${result.value}%"
 		}
 	}

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

@@ -338,7 +338,8 @@ private Map getBatteryResult(rawValue) {
 				def minVolts = 2.1
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
-				result.value = Math.min(100, (int) pct * 100)
+				def roundedPct = Math.round(pct * 100)
+				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}

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

@@ -24,6 +24,7 @@
  		capability "Refresh"
  		capability "Temperature Measurement"
 		capability "Health Check"
+		capability "Sensor"
 
 		command "enrollResponse"
  	}
@@ -234,7 +235,8 @@ def getTemperature(value) {
 			def minVolts = 2.1
 			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			result.value = Math.min(100, (int) pct * 100)
+			def roundedPct = Math.round(pct * 100)
+			result.value = Math.min(100, roundedPct)
 			result.descriptionText = "${linkText} battery was ${result.value}%"
 		}
 

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

@@ -13,7 +13,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
- 
+
 metadata {
 	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
 		capability "Battery"
@@ -22,24 +22,25 @@ metadata {
 		capability "Refresh"
 		capability "Temperature Measurement"
 		capability "Health Check"
-        
+		capability "Sensor"
+
 		command "enrollResponse"
- 
- 
+
+
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3300-S"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3300"
 		fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3320-L", deviceJoinName: "Iris Contact Sensor"
 	}
- 
+
 	simulator {
- 
+
 	}
 
 	preferences {
 		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
 		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
- 
+
 	tiles(scale: 2) {
 		multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
@@ -72,10 +73,10 @@ metadata {
 		details(["contact","temperature","battery","refresh"])
 	}
 }
- 
+
 def parse(String description) {
 	log.debug "description: $description"
-    
+
 	Map map = [:]
 	if (description?.startsWith('catchall:')) {
 		map = parseCatchAllMessage(description)
@@ -89,10 +90,10 @@ def parse(String description) {
     else if (description?.startsWith('zone status')) {
     	map = parseIasMessage(description)
     }
- 
+
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
-    
+
     if (description?.startsWith('enroll request')) {
     	List cmds = enrollResponse()
         log.debug "enroll response: ${cmds}"
@@ -100,7 +101,7 @@ def parse(String description) {
     }
     return result
 }
- 
+
 private Map parseCatchAllMessage(String description) {
     Map resultMap = [:]
     def cluster = zigbee.parse(description)
@@ -126,7 +127,7 @@ private Map parseCatchAllMessage(String description) {
 private boolean shouldProcessMessage(cluster) {
     // 0x0B is default response indicating message got through
     // 0x07 is bind message
-    boolean ignoredMessage = cluster.profileId != 0x0104 || 
+    boolean ignoredMessage = cluster.profileId != 0x0104 ||
         cluster.command == 0x0B ||
         cluster.command == 0x07 ||
         (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
@@ -136,14 +137,14 @@ private boolean shouldProcessMessage(cluster) {
 private int getHumidity(value) {
     return Math.round(Double.parseDouble(value))
 }
- 
+
 private Map parseReportAttributeMessage(String description) {
 	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
 		def nameAndValue = param.split(":")
 		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
 	}
 	log.debug "Desc Map: $descMap"
- 
+
 	Map resultMap = [:]
 	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
 		def value = getTemperature(descMap.value)
@@ -152,10 +153,10 @@ private Map parseReportAttributeMessage(String description) {
 	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
 		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
 	}
- 
+
 	return resultMap
 }
- 
+
 private Map parseCustomMessage(String description) {
 	Map resultMap = [:]
 	if (description?.startsWith('temperature: ')) {
@@ -168,7 +169,7 @@ private Map parseCustomMessage(String description) {
 private Map parseIasMessage(String description) {
     List parsedMsg = description.split(' ')
     String msgCode = parsedMsg[2]
-    
+
     Map resultMap = [:]
     switch(msgCode) {
         case '0x0020': // Closed/No Motion/Dry
@@ -201,7 +202,7 @@ private Map parseIasMessage(String description) {
     }
     return resultMap
 }
- 
+
 def getTemperature(value) {
 	def celsius = Integer.parseInt(value, 16).shortValue() / 100
 	if(getTemperatureScale() == "C"){
@@ -214,11 +215,11 @@ def getTemperature(value) {
 private Map getBatteryResult(rawValue) {
 	log.debug 'Battery'
 	def linkText = getLinkText(device)
-    
+
     def result = [
     	name: 'battery'
     ]
-    
+
 	def volts = rawValue / 10
 	def descriptionText
     if (rawValue == 0 || rawValue == 255) {}
@@ -229,7 +230,8 @@ private Map getBatteryResult(rawValue) {
 		def minVolts = 2.1
     	def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
-		result.value = Math.min(100, (int) pct * 100)
+		def roundedPct = Math.round(pct * 100)
+		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 	}
 
@@ -275,7 +277,7 @@ def refresh() {
 
 def configure() {
 	sendEvent(name: "checkInterval", value: 7200, displayed: false)
-	
+
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
 	def configCmds = [

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

@@ -21,6 +21,7 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Relative Humidity Measurement"
 		capability "Health Check"
+		capability "Sensor"
 
 		fingerprint endpointId: "01", inClusters: "0001,0003,0020,0402,0B05,FC45", outClusters: "0019,0003"
 	}
@@ -205,7 +206,8 @@ private Map getBatteryResult(rawValue) {
 		def minVolts = 2.1
     	def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
-		result.value = Math.min(100, (int) pct * 100)
+		def roundedPct = Math.round(pct * 100)
+		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 	}
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -13,7 +13,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
- 
+
 metadata {
 	definition (name: "Tyco Door/Window Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Battery"
@@ -21,28 +21,28 @@ metadata {
 		capability "Contact Sensor"
 		capability "Refresh"
 		capability "Temperature Measurement"
-        
+
 		command "enrollResponse"
- 
- 
+
+
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "Visonic", model: "MCT-340 SMA"
 	}
- 
+
 	simulator {
- 
+
 	}
 
 	preferences {
 		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
 		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
- 
+
 	tiles {
     	standardTile("contact", "device.contact", width: 2, height: 2) {
 			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
 			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
 		}
-    	
+
 		valueTile("temperature", "device.temperature", inactiveLabel: false) {
 			state "temperature", label:'${currentValue}°',
 				backgroundColors:[
@@ -58,23 +58,23 @@ metadata {
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
-        
+
         standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {
 			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
-        
+
 		standardTile("configure", "device.configure", inactiveLabel: false, decoration: "flat") {
 			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
 		}
- 
+
 		main (["contact", "temperature"])
 		details(["contact","temperature","battery","refresh","configure"])
 	}
 }
- 
+
 def parse(String description) {
 	log.debug "description: $description"
-    
+
 	Map map = [:]
 	if (description?.startsWith('catchall:')) {
 		map = parseCatchAllMessage(description)
@@ -88,10 +88,10 @@ def parse(String description) {
     else if (description?.startsWith('zone status')) {
     	map = parseIasMessage(description)
     }
- 
+
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
-    
+
     if (description?.startsWith('enroll request')) {
     	List cmds = enrollResponse()
         log.debug "enroll response: ${cmds}"
@@ -99,7 +99,7 @@ def parse(String description) {
     }
     return result
 }
- 
+
 private Map parseCatchAllMessage(String description) {
     Map resultMap = [:]
     def cluster = zigbee.parse(description)
@@ -125,20 +125,20 @@ private Map parseCatchAllMessage(String description) {
 private boolean shouldProcessMessage(cluster) {
     // 0x0B is default response indicating message got through
     // 0x07 is bind message
-    boolean ignoredMessage = cluster.profileId != 0x0104 || 
+    boolean ignoredMessage = cluster.profileId != 0x0104 ||
         cluster.command == 0x0B ||
         cluster.command == 0x07 ||
         (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
     return !ignoredMessage
 }
- 
+
 private Map parseReportAttributeMessage(String description) {
 	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
 		def nameAndValue = param.split(":")
 		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
 	}
 	log.debug "Desc Map: $descMap"
- 
+
 	Map resultMap = [:]
 	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
 		def value = getTemperature(descMap.value)
@@ -147,10 +147,10 @@ private Map parseReportAttributeMessage(String description) {
 	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
 		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
 	}
- 
+
 	return resultMap
 }
- 
+
 private Map parseCustomMessage(String description) {
 	Map resultMap = [:]
 	if (description?.startsWith('temperature: ')) {
@@ -163,7 +163,7 @@ private Map parseCustomMessage(String description) {
 private Map parseIasMessage(String description) {
     List parsedMsg = description.split(' ')
     String msgCode = parsedMsg[2]
-    
+
     Map resultMap = [:]
     switch(msgCode) {
         case '0x0020': // Closed/No Motion/Dry
@@ -196,7 +196,7 @@ private Map parseIasMessage(String description) {
     }
     return resultMap
 }
- 
+
 def getTemperature(value) {
 	def celsius = Integer.parseInt(value, 16).shortValue() / 100
 	if(getTemperatureScale() == "C"){
@@ -209,11 +209,11 @@ def getTemperature(value) {
 private Map getBatteryResult(rawValue) {
 	log.debug 'Battery'
 	def linkText = getLinkText(device)
-    
+
     def result = [
     	name: 'battery'
     ]
-    
+
 	def volts = rawValue / 10
 	def descriptionText
 	if (volts > 3.5) {
@@ -223,7 +223,8 @@ private Map getBatteryResult(rawValue) {
 		def minVolts = 2.1
     	def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
-		result.value = Math.min(100, (int) pct * 100)
+		def roundedPct = Math.round(pct * 100)
+		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 	}
 
@@ -261,7 +262,7 @@ def refresh()
 {
 	log.debug "Refreshing Temperature and Battery"
 	[
-    
+
         "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
 		"st rattr 0x${device.deviceNetworkId} 1 1 0x20"
 
@@ -274,24 +275,24 @@ def configure() {
 		log.debug "Configuring Reporting, IAS CIE, and Bindings."
 	def configCmds = [
     	"delay 1000",
-        
+
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 1", "delay 1500",
-        
+
         "zcl global send-me-a-report 1 0x20 0x20 600 3600 {01}", "delay 200",
         "send 0x${device.deviceNetworkId} 1 1", "delay 1500",
-        
+
         "zcl global send-me-a-report 0x402 0 0x29 300 3600 {6400}", "delay 200",
         "send 0x${device.deviceNetworkId} 1 1", "delay 1500",
-        
-        
+
+
         //"raw 0x500 {01 23 00 00 00}", "delay 200",
         //"send 0x${device.deviceNetworkId} 1 1", "delay 1500",
-        
-        
+
+
 		"zdo bind 0x${device.deviceNetworkId} 1 1 0x402 {${device.zigbeeId}} {}", "delay 500",
 		"zdo bind 0x${device.deviceNetworkId} 1 1 1 {${device.zigbeeId}} {}",
-        
+
         "delay 500"
 	]
     return configCmds + enrollResponse() + refresh() // send refresh cmds as part of config
@@ -299,11 +300,11 @@ def configure() {
 
 def enrollResponse() {
 	log.debug "Sending enroll response"
-    [	
-    	
+    [
+
 	"raw 0x500 {01 23 00 00 00}", "delay 200",
     "send 0x${device.deviceNetworkId} 1 1"
-        
+
     ]
 }
 private hex(value) {

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

@@ -1,8 +1,7 @@
 /**
- *  Iris Smart Fob
+ *  ZigBee Button
  *
  *  Copyright 2015 Mitch Pond
- *	Presence code adapted from SmartThings Arrival Sensor HA device type
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -14,181 +13,235 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+
 metadata {
-	definition (name: "ZigBee Button", namespace: "smartthings", author: "Mitch Pond") {
-		capability "Battery"
-		capability "Button"
+    definition (name: "ZigBee Button", namespace: "smartthings", author: "Mitch Pond") {
+        capability "Actuator"
+        capability "Battery"
+        capability "Button"
         capability "Configuration"
-		capability "Presence Sensor"
-		capability "Sensor"
-        
-		//fingerprint endpointId: "01", profileId: "0104", inClusters: "0000,0001,0003,0007,0020,0B05", outClusters: "0003,0006,0019", model:"3450-L", manufacturer: "CentraLite"
-	}
-    
-    preferences{
-	    input ("holdTime", "number", title: "Minimum time in seconds for a press to count as \"held\"",
-    		defaultValue: 3, displayDuringSetup: false)
-        input "checkInterval", "enum", title: "Presence timeout (minutes)",
-            defaultValue:"2", options: ["2", "3", "5"], displayDuringSetup: false
-        input "logging", "bool", title: "Enable debug logging",
-            defaultValue: false, displayDuringSetup: false
+        capability "Refresh"
+        capability "Sensor"
+
+        command "enrollResponse"
+
+        fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "OSRAM", model: "LIGHTIFY Dimming Switch", deviceJoinName: "OSRAM LIGHTIFY Dimming Switch"
+        //fingerprint inClusters: "0000, 0001, 0003, 0020, 0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L", deviceJoinName: "Iris Care Pendant"
+        //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
+        //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
     }
 
-	tiles(scale: 2) {
-    	standardTile("presence", "device.presence", width: 4, height: 4, canChangeBackground: true) {
-            state "present", label: "Present", labelIcon:"st.presence.tile.present", backgroundColor:"#53a7c0"
-            state "not present", labelIcon:"st.presence.tile.not-present", backgroundColor:"#ffffff"
-        }
-    	standardTile("button", "device.button", decoration: "flat", width: 2, height: 2) {
-        	state "default", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffffff"
-        }
-		valueTile("battery", "device.battery", decoration: "flat", width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
-		}
+    simulator {}
 
-		main (["presence"])
-		details(["presence","button","battery"])
-	}
+    preferences {
+        section {
+            input ("holdTime", "number", title: "Minimum time in seconds for a press to count as \"held\"", defaultValue: 1, displayDuringSetup: false)
+        }
+    }
+
+    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: "#79b821"
+        }
+
+        valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false) {
+            state "battery", label:'${currentValue}% battery', unit:""
+        }
+
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {
+            state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
+        }
+        main (["button"])
+        details(["button", "battery", "refresh"])
+    }
 }
 
 def parse(String description) {
-    def descMap = zigbee.parseDescriptionAsMap(description)
-    logIt descMap
-    state.lastCheckin = now()
-    logIt "lastCheckin = ${state.lastCheckin}"
-    handlePresenceEvent(true)
-    
-	def results = []
-    if (description?.startsWith('catchall:'))
-		results = parseCatchAllMessage(descMap)
-	else if (description?.startsWith('read attr -'))
-		results = parseReportAttributeMessage(descMap)
-    else logIt(descMap, "trace")
-        
-	return results;
+    log.debug "description is $description"
+    def event = zigbee.getEvent(description)
+    if (event) {
+        sendEvent(event)
+    }
+    else {
+        if ((description?.startsWith("catchall:")) || (description?.startsWith("read attr -"))) {
+            def descMap = zigbee.parseDescriptionAsMap(description)
+            if (descMap.clusterInt == 0x0001 && descMap.attrInt == 0x0020) {
+                event = getBatteryResult(zigbee.convertHexToInt(descMap.value))
+            }
+            else if (descMap.clusterInt == 0x0006 || descMap.clusterInt == 0x0008) {
+                event = parseNonIasButtonMessage(descMap)
+            }
+        }
+        else if (description?.startsWith('zone status')) {
+            event = parseIasButtonMessage(description)
+        }
+
+        log.debug "Parse returned $event"
+        def result = event ? createEvent(event) : []
+
+        if (description?.startsWith('enroll request')) {
+            List cmds = enrollResponse()
+            result = cmds?.collect { new physicalgraph.device.HubAction(it) }
+        }
+        return result
+    }
+}
+
+private Map parseIasButtonMessage(String description) {
+    int zoneInt = Integer.parseInt((description - "zone status 0x"), 16)
+    if (zoneInt & 0x02) {
+        resultMap = getButtonResult('press')
+    } else {
+        resultMap = getButtonResult('release')
+    }
+
+    return resultMap
+}
+
+private Map getBatteryResult(rawValue) {
+    log.debug 'Battery'
+    def volts = rawValue / 10
+    if (volts > 3.0 || volts == 0 || rawValue == 0xFF) {
+        return [:]
+    }
+    else {
+        def result = [
+                name: 'battery'
+        ]
+        def minVolts = 2.1
+        def maxVolts = 3.0
+        def pct = (volts - minVolts) / (maxVolts - minVolts)
+        result.value = Math.min(100, (int) pct * 100)
+        def linkText = getLinkText(device)
+        result.descriptionText = "${linkText} battery was ${result.value}%"
+        return result
+    }
+}
+
+private Map parseNonIasButtonMessage(Map descMap){
+    def buttonState = ""
+    def buttonNumber = 0
+    if (((device.getDataValue("model") == "3460-L") || (device.getDataValue("model") == "3450-L"))
+            &&(descMap.clusterInt == 0x0006)) {
+        if (descMap.command == "01") {
+            getButtonResult("press")
+        }
+        else if (descMap.command == "00") {
+            getButtonResult("release")
+        }
+    }
+    else if (descMap.clusterInt == 0x0006) {
+        buttonState = "pushed"
+        if (descMap.command == "01") {
+            buttonNumber = 1
+        }
+        else if (descMap.command == "00") {
+            buttonNumber = 2
+        }
+        if (buttonNumber !=0) {
+            def descriptionText = "$device.displayName button $buttonNumber was $buttonState"
+            return createEvent(name: "button", value: buttonState, data: [buttonNumber: buttonNumber], descriptionText: descriptionText, isStateChange: true)
+        }
+        else {
+            return [:]
+        }
+    }
+    else if (descMap.clusterInt == 0x0008) {
+        if (descMap.command == "05") {
+            state.buttonNumber = 1
+            getButtonResult("press", 1)
+        }
+        else if (descMap.command == "01") {
+            state.buttonNumber = 2
+            getButtonResult("press", 2)
+        }
+        else if (descMap.command == "03") {
+            getButtonResult("release", state.buttonNumber)
+        }
+    }
+}
+
+def refresh() {
+    log.debug "Refreshing Battery"
+
+    return zigbee.readAttribute(0x0001, 0x20) +
+            zigbee.enrollResponse()
+}
+
+def configure() {
+    log.debug "Configuring Reporting, IAS CIE, and Bindings."
+    def cmds = []
+    if (device.getDataValue("model") == "3450-L") {
+        cmds << [
+                "zdo bind 0x${device.deviceNetworkId} 1 1 6 {${device.zigbeeId}} {}", "delay 300",
+                "zdo bind 0x${device.deviceNetworkId} 2 1 6 {${device.zigbeeId}} {}", "delay 300",
+                "zdo bind 0x${device.deviceNetworkId} 3 1 6 {${device.zigbeeId}} {}", "delay 300",
+                "zdo bind 0x${device.deviceNetworkId} 4 1 6 {${device.zigbeeId}} {}", "delay 300"
+        ]
+    }
+    return zigbee.onOffConfig() +
+            zigbee.levelConfig() +
+            zigbee.configureReporting(0x0001, 0x20, 0x20, 30, 21600, 0x01) +
+            zigbee.enrollResponse() +
+            zigbee.readAttribute(0x0001, 0x20) +
+            cmds
+
+}
+
+private Map getButtonResult(buttonState, buttonNumber = 1) {
+    if (buttonState == 'release') {
+        log.debug "Button was value : $buttonState"
+        def timeDiff = now() - state.pressTime
+        log.info "timeDiff: $timeDiff"
+        def holdPreference = holdTime ?: 1
+        log.info "holdp1 : $holdPreference"
+        holdPreference = (holdPreference as int) * 1000
+        log.info "holdp2 : $holdPreference"
+        if (timeDiff > 10000) {         //timeDiff>10sec check for refresh sending release value causing actions to be executed
+            return [:]
+        }
+        else {
+            if (timeDiff < holdPreference) {
+                buttonState = "pushed"
+            }
+            else {
+                buttonState = "held"
+            }
+            def descriptionText = "$device.displayName button $buttonNumber was $buttonState"
+            return createEvent(name: "button", value: buttonState, data: [buttonNumber: buttonNumber], descriptionText: descriptionText, isStateChange: true)
+        }
+    }
+    else if (buttonState == 'press') {
+        log.debug "Button was value : $buttonState"
+        state.pressTime = now()
+        log.info "presstime: ${state.pressTime}"
+        return [:]
+    }
+}
+
+def installed() {
+    initialize()
 }
 
 def updated() {
-	startTimer()
-    configure()
+    initialize()
 }
 
-def configure(){
-	logIt "Configuring Smart Fob..."
-	[
-	"zdo bind 0x${device.deviceNetworkId} 1 1 6 {${device.zigbeeId}} {}", "delay 200",
-    "zdo bind 0x${device.deviceNetworkId} 2 1 6 {${device.zigbeeId}} {}", "delay 200",
-    "zdo bind 0x${device.deviceNetworkId} 3 1 6 {${device.zigbeeId}} {}", "delay 200",
-    "zdo bind 0x${device.deviceNetworkId} 4 1 6 {${device.zigbeeId}} {}", "delay 200",
-    "zdo bind 0x${device.deviceNetworkId} 1 1 1 {${device.zigbeeId}} {}", "delay 200"
-    ] +
-    zigbee.configureReporting(0x0001,0x0020,0x20,20,20,0x01)
-}
-
-def parseCatchAllMessage(descMap) {
-    if (descMap?.clusterId == "0006" && descMap?.command == "01") 		//button pressed
-    	handleButtonPress(descMap.sourceEndpoint as int)
-    else if (descMap?.clusterId == "0006" && descMap?.command == "00") 	//button released
-    	handleButtonRelease(descMap.sourceEndpoint as int)
-    else logIt("Parse: Unhandled message: ${descMap}","trace")
-}
-
-def parseReportAttributeMessage(descMap) {
-	if (descMap?.cluster == "0001" && descMap?.attrId == "0020") createBatteryEvent(getBatteryLevel(descMap.value))
-    else logIt descMap
-}
-
-private createBatteryEvent(percent) {
-	logIt "Battery level at " + percent
-	return createEvent([name: "battery", value: percent])
-}
-
-//this method determines if a press should count as a push or a hold and returns the relevant event type
-private handleButtonRelease(button) {
-	logIt "lastPress state variable: ${state.lastPress}"
-    def sequenceError = {logIt("Uh oh...missed a message? Dropping this event.", "error"); state.lastPress = null; return []}	
-    
-    if (!state.lastPress) return sequenceError()
-	else if (state.lastPress.button != button) return sequenceError()
-    
-    def currentTime = now()
-    def startOfPress = state.lastPress?.time
-    def timeDif = currentTime - startOfPress
-    def holdTimeMillisec = (settings.holdTime?:3).toInteger() * 1000
-    
-    state.lastPress = null	//we're done with this. clear it to make error conditions easier to catch
-    
-    if (timeDif < 0) 
-    //likely a message sequence issue or dropped packet. Drop this press and wait for another.
-    	return sequenceError()
-    else if (timeDif < holdTimeMillisec)
-    	return createButtonEvent(button,"pushed")
-    else 
-    	return createButtonEvent(button,"held")
-}
-
-private handleButtonPress(button) {
-	state.lastPress = [button: button, time: now()]
-}
-
-private createButtonEvent(button,action) {
-	logIt "Button ${button} ${action}"
-	return createEvent([
-    	name: "button",
-        value: action, 
-        data:[buttonNumber: button], 
-        descriptionText: "${device.displayName} button ${button} was ${action}",
-        isStateChange: true, 
-        displayed: true])
-}
-
-private getBatteryLevel(rawValue) {
-	def intValue = Integer.parseInt(rawValue,16)
-	def min = 2.1
-    def max = 3.0
-    def vBatt = intValue / 10
-    return ((vBatt - min) / (max - min) * 100) as int
-}
-
-private handlePresenceEvent(present) {
-    def wasPresent = device.currentState("presence")?.value == "present"
-    if (!wasPresent && present) {
-        logIt "Sensor is present"
-        startTimer()
-    } else if (!present) {
-        logIt "Sensor is not present"
-        stopTimer()
+def initialize() {
+    if ((device.getDataValue("manufacturer") == "OSRAM") && (device.getDataValue("model") == "LIGHTIFY Dimming Switch")) {
+        sendEvent(name: "numberOfButtons", value: 2)
     }
-    def linkText = getLinkText(device)
-    def eventMap = [
-        name: "presence",
-        value: present ? "present" : "not present",
-        linkText: linkText,
-        descriptionText: "${linkText} has ${present ? 'arrived' : 'left'}",
-    ]
-    logIt "Creating presence event: ${eventMap}"
-    sendEvent(eventMap)
-}
-
-private startTimer() {
-    logIt "Scheduling periodic timer"
-    schedule("0 * * * * ?", checkPresenceCallback)
-}
-
-private stopTimer() {
-    logIt "Stopping periodic timer"
-    unschedule()
-}
-
-def checkPresenceCallback() {
-    def timeSinceLastCheckin = (now() - state.lastCheckin) / 1000
-    def theCheckInterval = (checkInterval ? checkInterval as int : 2) * 60
-    logIt "Sensor checked in ${timeSinceLastCheckin} seconds ago"
-    if (timeSinceLastCheckin >= theCheckInterval) {
-        handlePresenceEvent(false)
+    else if ((device.getDataValue("manufacturer") == "CentraLite") &&
+            ((device.getDataValue("model") == "3455-L") || (device.getDataValue("model") == "3460-L"))) {
+        sendEvent(name: "numberOfButtons", value: 1)
     }
+    else if ((device.getDataValue("manufacturer") == "CentraLite") && (device.getDataValue("model") == "3450-L")) {
+        sendEvent(name: "numberOfButtons", value: 4)
+    }
+    else {
+        //default. can be changed
+        sendEvent(name: "numberOfButtons", value: 4)
+    }
+
 }
-
-// ****** Utility functions ******
-
-private logIt(str, logLevel = 'debug') {if (settings.logging) log."$logLevel"(str) }

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

@@ -53,7 +53,10 @@ def parse(String description) {
 
     def event = zigbee.getEvent(description)
     if (event) {
-        sendEvent(event)
+        if (event.name=="level" && event.value==0) {}
+        else {
+            sendEvent(event)
+        }
     }
     else {
         log.warn "DID NOT PARSE MESSAGE for description : $description"

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

@@ -28,6 +28,9 @@ metadata {
         capability "Switch"
         capability "Switch Level"
 
+        attribute "colorName", "string"
+        command "setGenericName"
+
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 RGBW", deviceJoinName: "OSRAM LIGHTIFY LED A19 RGBW"
@@ -54,15 +57,15 @@ metadata {
         controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
-        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: '${currentValue} K'
+        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "colorName", label: '${currentValue}'
         }
         standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 
         main(["switch"])
-        details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
+        details(["switch", "colorTempSliderControl", "colorName", "refresh"])
     }
 }
 
@@ -78,10 +81,16 @@ private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
 def parse(String description) {
     log.debug "description is $description"
 
-    def finalResult = zigbee.getEvent(description)
-    if (finalResult) {
-        log.debug finalResult
-        sendEvent(finalResult)
+    def event = zigbee.getEvent(description)
+    if (event) {
+        log.debug event
+        if (event.name=="level" && event.value==0) {}
+        else {
+            if (event.name=="colorTemperature") {
+                setGenericName(event.value)
+            }
+            sendEvent(event)
+        }
     }
     else {
         def zigbeeMap = zigbee.parseDescriptionAsMap(description)
@@ -121,9 +130,27 @@ def configure() {
 }
 
 def setColorTemperature(value) {
+    setGenericName(value)
     zigbee.setColorTemperature(value)
 }
 
+//Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature
+def setGenericName(value){
+    if (value != null) {
+        def genericName = "White"
+        if (value < 3300) {
+            genericName = "Soft White"
+        } else if (value < 4150) {
+            genericName = "Moonlight"
+        } else if (value <= 5000) {
+            genericName = "Cool White"
+        } else if (value >= 5000) {
+            genericName = "Daylight"
+        }
+        sendEvent(name: "colorName", value: genericName)
+    }
+}
+
 def setLevel(value) {
     zigbee.setLevel(value)
 }

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

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

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2015 SmartThings
+ *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -11,100 +11,133 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
-/*
- * Capabilities
- * - Battery
- * - Configuration
- * - Refresh
- * - Switch
- * - Valve
-*/
 
 metadata {
-	definition (name: "Zigbee Valve", namespace: "smartthings", author: "SmartThings") {
-		capability "Battery"
-		capability "Configuration"
-		capability "Refresh"
-		capability "Switch"
-		capability "Valve"
+    definition (name: "ZigBee Valve", namespace: "smartthings", author: "SmartThings") {
+        capability "Actuator"
+        capability "Battery"
+        capability "Configuration"
+        capability "Power Source"
+        capability "Refresh"
+        capability "Valve"
 
-		fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0020,0006,0B02", outClusters: "0003"
-	}
+        fingerprint profileId: "0104", inClusters: "0000, 0001, 0003, 0006, 0020, 0B02, FC02", outClusters: "0019", manufacturer: "WAXMAN", model: "leakSMART Water Valve v2.10", deviceJoinName: "leakSMART Valve"
+        fingerprint profileId: "0104", inClusters: "0000, 0001, 0003, 0004, 0005, 0006, 0008, 000F, 0020, 0B02", outClusters: "0003, 0019", manufacturer: "WAXMAN", model: "House Water Valve - MDL-TBD", deviceJoinName: "Waxman House Water Valve"
+    }
 
-	// simulator metadata
-	simulator {
-		// status messages
-		status "on": "on/off: 1"
-		status "off": "on/off: 0"
+    // simulator metadata
+    simulator {
+        // status messages
+        status "on": "on/off: 1"
+        status "off": "on/off: 0"
 
-		// reply messages
-		reply "zcl on-off on": "on/off: 1"
-		reply "zcl on-off off": "on/off: 0"
-	}
+        // reply messages
+        reply "zcl on-off on": "on/off: 1"
+        reply "zcl on-off off": "on/off: 0"
+    }
 
-	// UI tile definitions
-	tiles {
-		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "off", label: 'closed', action: "switch.on", icon: "st.Outdoor.outdoor16", backgroundColor: "#e86d13"
-			state "on", label: 'open', action: "switch.off", icon: "st.Outdoor.outdoor16", backgroundColor: "#53a7c0"
-		}
-		main "switch"
-		details(["switch"])
-	}
+    tiles(scale: 2) {
+        multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
+            tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+                attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0", nextState:"closing"
+                attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13", nextState:"opening"
+                attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0", nextState:"closing"
+                attributeState "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13", nextState:"opening"
+            }
+            tileAttribute ("powerSource", key: "SECONDARY_CONTROL") {
+                attributeState "powerSource", label:'Power Source: ${currentValue}'
+            }
+        }
+
+        valueTile("battery", "device.battery", inactiveLabel:false, decoration:"flat", width:2, height:2) {
+            state "battery", label:'${currentValue}% battery', unit:""
+        }
+
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+        }
+
+        main(["valve"])
+        details(["valve", "battery", "refresh"])
+    }
 }
 
+private getCLUSTER_BASIC() { 0x0000 }
+private getBASIC_ATTR_POWER_SOURCE() { 0x0007 }
+private getCLUSTER_POWER() { 0x0001 }
+private getPOWER_ATTR_BATTERY_PERCENTAGE_REMAINING() { 0x0021 }
+private getTYPE_U8() { 0x20 }
+private getTYPE_ENUM8() { 0x30 }
+
 // Parse incoming device messages to generate events
 def parse(String description) {
-	log.info description
-	if (description?.startsWith("catchall:")) {
-        def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
-		def result = createEvent(name: name, value: value)
-        def msg = zigbee.parse(description)
-		log.debug "Parse returned ${result?.descriptionText}"
-		return result
-		log.trace msg
-		log.trace "data: $msg.data"
-	}
-	else {
-		def name = description?.startsWith("on/off: ") ? "switch" : null
-		def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
-		def result = createEvent(name: name, value: value)
-		log.debug "Parse returned ${result?.descriptionText}"
-		return result
-	}
-}
-
-// Commands to device
-def on() {
-	log.debug "on()"
-	sendEvent(name: "switch", value: "on")
-	"st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
-}
-
-def off() {
-	log.debug "off()"
-	sendEvent(name: "switch", value: "off")
-	"st cmd 0x${device.deviceNetworkId} 1 6 0 {}"
+    log.debug "description is $description"
+    def event = zigbee.getEvent(description)
+    if (event) {
+        if(event.name == "switch") {
+            event.name = "contact"                  //0006 cluster in valve is tied to contact
+            if(event.value == "on") {
+                event.value = "open"
+            }
+            else if(event.value == "off") {
+                event.value = "closed"
+            }
+        }
+        sendEvent(event)
+    }
+    else {
+        def descMap = zigbee.parseDescriptionAsMap(description)
+        if (descMap.clusterInt == CLUSTER_BASIC && descMap.attrInt == BASIC_ATTR_POWER_SOURCE){
+            def value = descMap.value
+            if (value == "01" || value == "02") {
+                sendEvent(name: "powerSource", value: "Mains")
+            }
+            else if (value == "03") {
+                sendEvent(name: "powerSource", value: "Battery")
+            }
+            else if (value == "04") {
+                sendEvent(name: "powerSource", value: "DC")
+            }
+            else {
+                sendEvent(name: "powerSource", value: "Unknown")
+            }
+        }
+        else if (descMap.clusterInt == CLUSTER_POWER && descMap.attrInt == POWER_ATTR_BATTERY_PERCENTAGE_REMAINING) {
+            event.name = "battery"
+            event.value = Math.round(Integer.parseInt(descMap.value, 16) / 2)
+            sendEvent(event)
+        }
+        else {
+            log.warn "DID NOT PARSE MESSAGE for description : $description"
+            log.debug descMap
+        }
+    }
 }
 
 def open() {
-	log.debug "on()"
-	sendEvent(name: "switch", value: "on")
-	"st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
+    zigbee.on()
 }
 
 def close() {
-	log.debug "off()"
-	sendEvent(name: "switch", value: "off")
-	"st cmd 0x${device.deviceNetworkId} 1 6 0 {}"
+    zigbee.off()
 }
 
 def refresh() {
-	log.debug "sending refresh command"
-	"st rattr 0x${device.deviceNetworkId} 1 6 0"
+    log.debug "refresh called"
+    zigbee.onOffRefresh() +
+    zigbee.readAttribute(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE) +
+    zigbee.readAttribute(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING) +
+    zigbee.onOffConfig() +
+    zigbee.configureReporting(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING, TYPE_U8, 600, 21600, 1) +
+    zigbee.configureReporting(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE, TYPE_ENUM8, 5, 21600, 1)
 }
 
 def configure() {
-
-	"zdo bind 0x${device.deviceNetworkId} 1 1 6 {${device.zigbeeId}} {}"
+    log.debug "Configuring Reporting and Bindings."
+    zigbee.onOffConfig() +
+    zigbee.configureReporting(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING, TYPE_U8, 600, 21600, 1) +
+    zigbee.configureReporting(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE, TYPE_ENUM8, 5, 21600, 1) +
+    zigbee.onOffRefresh() +
+    zigbee.readAttribute(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE) +
+    zigbee.readAttribute(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING)
 }

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

@@ -49,9 +49,6 @@ metadata {
             tileAttribute ("device.level", key: "SLIDER_CONTROL") {
                 attributeState "level", action:"switch level.setLevel"
             }
-            tileAttribute ("colorName", key: "SECONDARY_CONTROL") {
-                attributeState "colorName", label:'${currentValue}'
-            }
         }
 
         standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
@@ -61,12 +58,12 @@ metadata {
         controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
-        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: '${currentValue} K'
+        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "colorName", label: '${currentValue}'
         }
 
         main(["switch"])
-        details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
+        details(["switch", "colorTempSliderControl", "colorName", "refresh"])
     }
 }
 
@@ -75,7 +72,13 @@ def parse(String description) {
     log.debug "description is $description"
     def event = zigbee.getEvent(description)
     if (event) {
-        sendEvent(event)
+        if (event.name=="level" && event.value==0) {}
+        else {
+            if (event.name=="colorTemperature") {
+                setGenericName(event.value)
+            }
+            sendEvent(event)
+        }
     }
     else {
         log.warn "DID NOT PARSE MESSAGE for description : $description"

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

@@ -0,0 +1,205 @@
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+metadata {
+	definition (name: "Z-Wave Dimmer Switch Generic", namespace: "smartthings", author: "SmartThings") {
+		capability "Switch Level"
+		capability "Actuator"
+		capability "Switch"
+		capability "Polling"
+		capability "Refresh"
+		capability "Sensor"
+
+		fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer"
+	}
+
+	simulator {
+		status "on":  "command: 2003, payload: FF"
+		status "off": "command: 2003, payload: 00"
+		status "09%": "command: 2003, payload: 09"
+		status "10%": "command: 2003, payload: 0A"
+		status "33%": "command: 2003, payload: 21"
+		status "66%": "command: 2003, payload: 42"
+		status "99%": "command: 2003, payload: 63"
+
+		// reply messages
+		reply "2001FF,delay 5000,2602": "command: 2603, payload: FF"
+		reply "200100,delay 5000,2602": "command: 2603, payload: 00"
+		reply "200119,delay 5000,2602": "command: 2603, payload: 19"
+		reply "200132,delay 5000,2602": "command: 2603, payload: 32"
+		reply "20014B,delay 5000,2602": "command: 2603, payload: 4B"
+		reply "200163,delay 5000,2602": "command: 2603, payload: 63"
+	}
+
+	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:"#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:"#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") {
+				attributeState "level", action:"switch level.setLevel"
+			}
+		}
+
+		standardTile("refresh", "device.switch", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+
+		valueTile("level", "device.level", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+			state "level", label:'${currentValue} %', unit:"%", backgroundColor:"#ffffff"
+		}
+
+		main(["switch"])
+		details(["switch", "level", "refresh"])
+
+	}
+}
+
+def parse(String description) {
+	def result = null
+	if (description != "updated") {
+		log.debug "parse() >> zwave.parse($description)"
+		def cmd = zwave.parse(description, [0x20: 1, 0x26: 1, 0x70: 1])
+		if (cmd) {
+			result = zwaveEvent(cmd)
+		}
+	}
+	if (result?.name == 'hail' && hubFirmwareLessThan("000.011.00602")) {
+		result = [result, response(zwave.basicV1.basicGet())]
+		log.debug "Was hailed: requesting state update"
+	} else {
+		log.debug "Parse returned ${result?.descriptionText}"
+	}
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
+	dimmerEvents(cmd)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
+	dimmerEvents(cmd)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelReport cmd) {
+	dimmerEvents(cmd)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelSet cmd) {
+	dimmerEvents(cmd)
+}
+
+private dimmerEvents(physicalgraph.zwave.Command cmd) {
+	def value = (cmd.value ? "on" : "off")
+	def result = [createEvent(name: "switch", value: value)]
+	if (cmd.value && cmd.value <= 100) {
+		result << createEvent(name: "level", value: cmd.value, unit: "%")
+	}
+	return result
+}
+
+
+def zwaveEvent(physicalgraph.zwave.commands.configurationv1.ConfigurationReport cmd) {
+	log.debug "ConfigurationReport $cmd"
+	def value = "when off"
+	if (cmd.configurationValue[0] == 1) {value = "when on"}
+	if (cmd.configurationValue[0] == 2) {value = "never"}
+	createEvent([name: "indicatorStatus", value: value])
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.hailv1.Hail cmd) {
+	createEvent([name: "hail", value: "hail", descriptionText: "Switch button was pressed", displayed: false])
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+	log.debug "manufacturerId:   ${cmd.manufacturerId}"
+	log.debug "manufacturerName: ${cmd.manufacturerName}"
+	log.debug "productId:        ${cmd.productId}"
+	log.debug "productTypeId:    ${cmd.productTypeId}"
+	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
+	updateDataValue("MSR", msr)
+	updateDataValue("manufacturer", cmd.manufacturerName)
+	createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelStopLevelChange cmd) {
+	[createEvent(name:"switch", value:"on"), response(zwave.switchMultilevelV1.switchMultilevelGet().format())]
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	// Handles all Z-Wave commands we aren't interested in
+	[:]
+}
+
+def on() {
+	delayBetween([
+			zwave.basicV1.basicSet(value: 0xFF).format(),
+			zwave.switchMultilevelV1.switchMultilevelGet().format()
+	],5000)
+}
+
+def off() {
+	delayBetween([
+			zwave.basicV1.basicSet(value: 0x00).format(),
+			zwave.switchMultilevelV1.switchMultilevelGet().format()
+	],5000)
+}
+
+def setLevel(value) {
+	log.debug "setLevel >> value: $value"
+	def valueaux = value as Integer
+	def level = Math.max(Math.min(valueaux, 99), 0)
+	if (level > 0) {
+		sendEvent(name: "switch", value: "on")
+	} else {
+		sendEvent(name: "switch", value: "off")
+	}
+	sendEvent(name: "level", value: level, unit: "%")
+	delayBetween ([zwave.basicV1.basicSet(value: level).format(), zwave.switchMultilevelV1.switchMultilevelGet().format()], 5000)
+}
+
+def setLevel(value, duration) {
+	log.debug "setLevel >> value: $value, duration: $duration"
+	def valueaux = value as Integer
+	def level = Math.max(Math.min(valueaux, 99), 0)
+	def dimmingDuration = duration < 128 ? duration : 128 + Math.round(duration / 60)
+	def getStatusDelay = duration < 128 ? (duration*1000)+2000 : (Math.round(duration / 60)*60*1000)+2000
+	delayBetween ([zwave.switchMultilevelV2.switchMultilevelSet(value: level, dimmingDuration: dimmingDuration).format(),
+				   zwave.switchMultilevelV1.switchMultilevelGet().format()], getStatusDelay)
+}
+
+def poll() {
+	zwave.switchMultilevelV1.switchMultilevelGet().format()
+}
+
+def refresh() {
+	log.debug "refresh() is called"
+	def commands = []
+	commands << zwave.switchMultilevelV1.switchMultilevelGet().format()
+	if (getDataValue("MSR") == null) {
+		commands << zwave.manufacturerSpecificV1.manufacturerSpecificGet().format()
+	}
+	delayBetween(commands,100)
+}
+
+def invertSwitch(invert=true) {
+	if (invert) {
+		zwave.configurationV1.configurationSet(configurationValue: [1], parameterNumber: 4, size: 1).format()
+	}
+	else {
+		zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 4, size: 1).format()
+	}
+}

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

@@ -28,7 +28,6 @@ metadata {
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x98"
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x98", outClusters: "0x5A,0x82"
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x80,0x71,0x85,0x70,0x72,0x86,0x30,0x31,0x84,0x59,0x73,0x5A,0x8F,0x98,0x7A", outClusters:"0x20" // Philio multi+
-		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x72,0x5A,0x80,0x73,0x84,0x85,0x59,0x71,0x70,0x7A,0x98" // Vision door/window
 	}
 
 	// simulator metadata
@@ -36,6 +35,7 @@ metadata {
 		// status messages
 		status "open":  "command: 2001, payload: FF"
 		status "closed": "command: 2001, payload: 00"
+		status "wake up": "command: 8407, payload: "
 	}
 
 	// UI tile definitions
@@ -83,12 +83,12 @@ def updated() {
 		cmds = [
 			command(zwave.manufacturerSpecificV2.manufacturerSpecificGet()),
 			"delay 1200",
-			zwave.wakeUpV1.wakeUpNoMoreInformation()
+			zwave.wakeUpV1.wakeUpNoMoreInformation().format()
 		]
 	} else if (!state.lastbat) {
 		cmds = []
 	} else {
-		cmds = [zwave.wakeUpV1.wakeUpNoMoreInformation()]
+		cmds = [zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
 	}
 	response(cmds)
 }
@@ -175,7 +175,7 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
 	if (!state.lastbat || now() - state.lastbat > 53*60*60*1000) {
 		cmds << command(zwave.batteryV1.batteryGet())
 	} else {
-		cmds << zwave.wakeUpV1.wakeUpNoMoreInformation()
+		cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
 	}
 	[event, response(cmds)]
 }

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

@@ -0,0 +1,143 @@
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+metadata {
+	definition (name: "Z-Wave Switch Generic", namespace: "smartthings", author: "SmartThings") {
+		capability "Actuator"
+ 		capability "Switch"
+		capability "Polling"
+		capability "Refresh"
+		capability "Sensor"
+
+		fingerprint inClusters: "0x25", deviceJoinName: "Z-Wave Switch"
+	}
+
+	// simulator metadata
+	simulator {
+		status "on":  "command: 2003, payload: FF"
+		status "off": "command: 2003, payload: 00"
+
+		// reply messages
+		reply "2001FF,delay 100,2502": "command: 2503, payload: FF"
+		reply "200100,delay 100,2502": "command: 2503, payload: 00"
+	}
+
+	// tile definitions
+	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: "#79b821"
+				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
+			}
+		}
+
+		standardTile("refresh", "device.switch", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+
+		main "switch"
+		details(["switch","refresh"])
+	}
+}
+
+def parse(String description) {
+	def result = null
+	def cmd = zwave.parse(description, [0x20: 1, 0x70: 1])
+	if (cmd) {
+		result = createEvent(zwaveEvent(cmd))
+	}
+	if (result?.name == 'hail' && hubFirmwareLessThan("000.011.00602")) {
+		result = [result, response(zwave.basicV1.basicGet())]
+		log.debug "Was hailed: requesting state update"
+	} else {
+		log.debug "Parse returned ${result?.descriptionText}"
+	}
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
+	[name: "switch", value: cmd.value ? "on" : "off", type: "physical"]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
+	[name: "switch", value: cmd.value ? "on" : "off", type: "physical"]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd) {
+	[name: "switch", value: cmd.value ? "on" : "off", type: "digital"]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.configurationv1.ConfigurationReport cmd) {
+	def value = "when off"
+	if (cmd.configurationValue[0] == 1) {value = "when on"}
+	if (cmd.configurationValue[0] == 2) {value = "never"}
+	[name: "indicatorStatus", value: value, display: false]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.hailv1.Hail cmd) {
+	[name: "hail", value: "hail", descriptionText: "Switch button was pressed", displayed: false]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+	log.debug "manufacturerId:   ${cmd.manufacturerId}"
+	log.debug "manufacturerName: ${cmd.manufacturerName}"
+	log.debug "productId:        ${cmd.productId}"
+	log.debug "productTypeId:    ${cmd.productTypeId}"
+	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
+	updateDataValue("MSR", msr)
+	updateDataValue("manufacturer", cmd.manufacturerName)
+	createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
+}
+
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	// Handles all Z-Wave commands we aren't interested in
+	[:]
+}
+
+def on() {
+	delayBetween([
+		zwave.basicV1.basicSet(value: 0xFF).format(),
+		zwave.switchBinaryV1.switchBinaryGet().format()
+	])
+}
+
+def off() {
+	delayBetween([
+		zwave.basicV1.basicSet(value: 0x00).format(),
+		zwave.switchBinaryV1.switchBinaryGet().format()
+	])
+}
+
+def poll() {
+	delayBetween([
+		zwave.switchBinaryV1.switchBinaryGet().format(),
+		zwave.manufacturerSpecificV1.manufacturerSpecificGet().format()
+	])
+}
+
+def refresh() {
+	delayBetween([
+		zwave.switchBinaryV1.switchBinaryGet().format(),
+		zwave.manufacturerSpecificV1.manufacturerSpecificGet().format()
+	])
+}
+
+def invertSwitch(invert=true) {
+	if (invert) {
+		zwave.configurationV1.configurationSet(configurationValue: [1], parameterNumber: 4, size: 1).format()
+	}
+	else {
+		zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 4, size: 1).format()
+	}
+}

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

@@ -15,12 +15,15 @@ metadata {
 	definition (name: "Z-Wave Switch", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Indicator"
-		capability "Switch"
+ 		capability "Switch"
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"
 
-		fingerprint inClusters: "0x25"
+		fingerprint mfr:"0063", prod:"4952", deviceJoinName: "Z-Wave Wall Switch"
+		fingerprint mfr:"0063", prod:"5257", deviceJoinName: "Z-Wave Wall Switch"
+		fingerprint mfr:"0063", prod:"5052", deviceJoinName: "Z-Wave Plug-In Switch"
+		fingerprint mfr:"0113", prod:"5257", deviceJoinName: "Z-Wave Wall Switch"
 	}
 
 	// simulator metadata
@@ -33,6 +36,10 @@ metadata {
 		reply "200100,delay 100,2502": "command: 2503, payload: 00"
 	}
 
+	preferences {
+		input "ledIndicator", "enum", title: "LED Indicator", description: "Turn LED indicator... ", required: false, options:["on": "When On", "off": "When Off", "never": "Never"], defaultValue: "off"
+	}
+
 	// tile definitions
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
@@ -52,10 +59,27 @@ metadata {
 		}
 
 		main "switch"
-		details(["switch","refresh","indicator"])
+		details(["switch","refresh"])
 	}
 }
 
+def updated(){
+  switch (ledIndicator) {
+        case "on":
+            indicatorWhenOn()
+            break
+        case "off":
+            indicatorWhenOff()
+            break
+        case "never":
+            indicatorNever()
+            break
+        default:
+            indicatorWhenOn()
+            break
+    }
+}
+
 def parse(String description) {
 	def result = null
 	def cmd = zwave.parse(description, [0x20: 1, 0x70: 1])
@@ -139,19 +163,19 @@ def refresh() {
 	])
 }
 
-def indicatorWhenOn() {
+void indicatorWhenOn() {
 	sendEvent(name: "indicatorStatus", value: "when on", display: false)
-	zwave.configurationV1.configurationSet(configurationValue: [1], parameterNumber: 3, size: 1).format()
+	sendHubCommand(new physicalgraph.device.HubAction(zwave.configurationV1.configurationSet(configurationValue: [1], parameterNumber: 3, size: 1).format()))
 }
 
-def indicatorWhenOff() {
+void indicatorWhenOff() {
 	sendEvent(name: "indicatorStatus", value: "when off", display: false)
-	zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 3, size: 1).format()
+	sendHubCommand(new physicalgraph.device.HubAction(zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 3, size: 1).format()))
 }
 
-def indicatorNever() {
+void indicatorNever() {
 	sendEvent(name: "indicatorStatus", value: "never", display: false)
-	zwave.configurationV1.configurationSet(configurationValue: [2], parameterNumber: 3, size: 1).format()
+	sendHubCommand(new physicalgraph.device.HubAction(zwave.configurationV1.configurationSet(configurationValue: [2], parameterNumber: 3, size: 1).format()))
 }
 
 def invertSwitch(invert=true) {

smartapps/com-gidjit-smartthings-hub/gidjit-hub.src/gidjit-hub.groovy

@@ -24,17 +24,24 @@ definition(
     iconX3Url: "http://www.gidjit.com/appicon@3x.png",
     oauth: [displayName: "Gidjit", displayLink: "www.gidjit.com"])
 
+preferences(oauthPage: "deviceAuthorization") {
+    // deviceAuthorization page is simply the devices to authorize
+    page(name: "deviceAuthorization", title: "Device Authorization", nextPage: "instructionPage",
+         install: false, uninstall: true) {
+  		section ("Allow Gidjit to have access, thereby allowing you to quickly control and monitor your following devices. Privacy Policy can be found at http://priv.gidjit.com/privacy.html") {
+    		input "switches", "capability.switch", title: "Control/Monitor your switches", multiple: true, required: false
+    		input "thermostats", "capability.thermostat", title: "Control/Monitor your thermostats", multiple: true, required: false
+    		input "windowShades", "capability.windowShade", title: "Control/Monitor your window shades", multiple: true, required: false //windowShade
+        }
 
-
-preferences {
-  section ("Allow Gidjit to have access, there by allowing you to quickly control and monitor the following devices") {
-    input "switches", "capability.switch", title: "Control/Monitor your switches", multiple: true, required: false
-    input "thermostats", "capability.thermostat", title: "Control/Monitor your thermostats", multiple: true, required: false
-    input "windowShades", "capability.windowShade", title: "Control/Monitor your window shades", multiple: true, required: false //windowShade
-    //input "bulbs", "capability.colorControl", title: "Control your lights", multiple: true, required: false //windowShade
-
-  }
+    }
+    page(name: "instructionPage", title: "Device Discovery", install: true) {
+        section() {
+            paragraph "Now the process is complete return to the Devices section of the Detected Screen. From there and you can add actions to each of your device panels, including launching SmartThings routines."
+        }
+    }
 }
+
 mappings {
   path("/structureinfo") {
     action: [

smartapps/docwisdom/humidity-alert.src/humidity-alert.groovy

@@ -78,7 +78,7 @@ def humidityHandler(evt) {
 			log.debug "Notification already sent within the last ${deltaMinutes} minutes"
 			
 		} else {
-			log.debug "Humidity Rose Above ${tooHumid}:  sending SMS to $phone1 and activating ${mySwitch}"
+			log.debug "Humidity Rose Above ${tooHumid}:  sending SMS and activating ${mySwitch}"
 			send("${humiditySensor1.label} sensed high humidity level of ${evt.value}")
 			switch1?.on()
 		}
@@ -91,7 +91,7 @@ def humidityHandler(evt) {
 			log.debug "Notification already sent within the last ${deltaMinutes} minutes"
 			
 		} else {
-			log.debug "Humidity Fell Below ${notHumidEnough}:  sending SMS to $phone1 and activating ${mySwitch}"
+			log.debug "Humidity Fell Below ${notHumidEnough}:  sending SMS and activating ${mySwitch}"
 			send("${humiditySensor1.label} sensed high humidity level of ${evt.value}")
 			switch1?.off()
 		}

smartapps/dooglave/let-there-be-dark.src/let-there-be-dark.groovy

@@ -25,15 +25,11 @@ preferences {
 
 def installed() {
 	subscribe(contact1, "contact", contactHandler)
-	subscribe(switch1, "switch.on", switchOnHandler)
-    subscribe(switch1, "switch.off", switchOffHandler)
 }
 
 def updated() {
 	unsubscribe()
 	subscribe(contact1, "contact", contactHandler)
-	subscribe(switch1, "switch.on", switchOnHandler)
-    subscribe(switch1, "switch.off", switchOffHandler)
 }
 
 def contactHandler(evt) {
@@ -46,4 +42,4 @@ def contactHandler(evt) {
 if (evt.value == "closed") {
 	if(state.wasOn)switch1.on()
 }
-}
+}

smartapps/sheikhsphere/smart-humidifier.src/smart-humidifier.groovy

@@ -77,7 +77,7 @@ def humidityHandler(evt) {
 
 		} else {
          	if (state.lastStatus != "off") {
-                log.debug "Humidity Rose Above $humidityHigh1:  sending SMS to $phone1 and deactivating $mySwitch"
+                log.debug "Humidity Rose Above $humidityHigh1:  sending SMS and deactivating $mySwitch"
                 send("${humiditySensor1.label} sensed high humidity level of ${evt.value}, turning off ${switch1.label}")
                 switch1?.off()
                 state.lastStatus = "off"
@@ -99,7 +99,7 @@ def humidityHandler(evt) {
 
 		} else {
         	if (state.lastStatus != "on") {
-                log.debug "Humidity Dropped Below $humidityLow1:  sending SMS to $phone1 and activating $mySwitch"
+                log.debug "Humidity Dropped Below $humidityLow1:  sending SMS and activating $mySwitch"
                 send("${humiditySensor1.label} sensed low humidity level of ${evt.value}, turning on ${switch1.label}")
                 switch1?.on()
                 state.lastStatus = "on"
@@ -125,4 +125,4 @@ private send(msg) {
     }
 
     log.debug msg
-}
+}

smartapps/smartthings/gentle-wake-up.src/gentle-wake-up.groovy

@@ -237,7 +237,7 @@ def completionPage() {
 		}
 
 		section("Notifications") {
-			input("recipients", "contact", title: "Send notifications to") {
+			input("recipients", "contact", title: "Send notifications to", required: false) {
 				input(name: "completionPhoneNumber", type: "phone", title: "Text This Number", description: "Phone number", required: false)
 				input(name: "completionPush", type: "bool", title: "Send A Push Notification", description: "Phone number", required: false)
 			}
@@ -720,7 +720,7 @@ def completionPercentage() {
 
 	def now = new Date().getTime()
 	def timeElapsed = now - atomicState.start
-	def totalRunTime = totalRunTimeMillis()
+	def totalRunTime = totalRunTimeMillis() ?: 1
 	def percentComplete = timeElapsed / totalRunTime * 100
 	log.debug "percentComplete: ${percentComplete}"
 

smartapps/smartthings/has-barkley-been-fed.src/has-barkley-been-fed.groovy

@@ -68,7 +68,7 @@ def scheduleCheck()
             sendNotificationToContacts("No one has fed the dog", recipients)
         }
         else {
-            log.debug "Feeder was not opened since $midnight, texting $phone1"
+            log.debug "Feeder was not opened since $midnight, texting one phone number"
             sendSms(phone1, "No one has fed the dog")
         }
 	}

smartapps/smartthings/its-too-cold.src/its-too-cold.groovy

@@ -69,10 +69,10 @@ def temperatureHandler(evt) {
 		def alreadySentSms = recentEvents.count { it.doubleValue <= tooCold } > 1
 
 		if (alreadySentSms) {
-			log.debug "SMS already sent to $phone1 within the last $deltaMinutes minutes"
+			log.debug "SMS already sent within the last $deltaMinutes minutes"
 			// TODO: Send "Temperature back to normal" SMS, turn switch off
 		} else {
-			log.debug "Temperature dropped below $tooCold:  sending SMS to $phone1 and activating $mySwitch"
+			log.debug "Temperature dropped below $tooCold:  sending SMS and activating $mySwitch"
 			def tempScale = location.temperatureScale ?: "F"
 			send("${temperatureSensor1.displayName} is too cold, reporting a temperature of ${evt.value}${evt.unit?:tempScale}")
 			switch1?.on()

smartapps/thehomeremote-homeremote/home-remote.src/home-remote.groovy

@@ -1,798 +0,0 @@
-/**
- *  Home Remote
- *
- *  Copyright 2015 The Home Remote
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-definition(
-    name: "Home Remote",
-    namespace: "thehomeremote.homeremote",
-    author: "The Home Remote",
-    description: "Web service that enables communication between the Home Remote app and a SmartThings hub.",
-    category: "My Apps",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    oauth: [displayName: "The Home Remote", displayLink: "http://thehomeremote.com/"])
-
-
-preferences {
-    section() {
-	input "accelerationSensors", "capability.accelerationSensor",title: "Acceleration Sensors", multiple: true, required: false
-	input "alarms", "capability.alarm",title: "Alarms", multiple: true, required: false
-	input "batteries", "capability.battery",title: "Batteries", multiple: true, required: false
-	input "beacons", "capability.beacon",title: "Beacons", multiple: true, required: false
-	input "buttonGroup", "capability.button",title: "Buttons", multiple: true, required: false
-	input "carbonMonoxideDetectors", "capability.carbonMonoxideDetector",title: "CO Detectors", multiple: true, required: false
-	input "colorControls", "capability.colorControl",title: "Color Lights", multiple: true, required: false
-	input "contactSensors", "capability.contactSensor",title: "Contact Sensors", multiple: true, required: false
-	input "doorControls", "capability.doorControl",title: "Door Controllers", multiple: true, required: false
-	input "energyMeters", "capability.energyMeter",title: "Energy Meters", multiple: true, required: false
-	input "illuminanceMeasurements", "capability.illuminanceMeasurement",title: "Illuminance Sensors", multiple: true, required: false
-	input "imageCaptures", "capability.imageCapture",title: "Cameras", multiple: true, required: false
-	input "locks", "capability.lock",title: "Locks", multiple: true, required: false
-	input "mediaControllers", "capability.mediaController",title: "Media Controllers", multiple: true, required: false
-	input "momentaries", "capability.momentary",title: "Momentary Buttons", multiple: true, required: false
-	input "motionSensors", "capability.motionSensor",title: "Motion Sensors", multiple: true, required: false
-	input "musicPlayers", "capability.musicPlayer",title: "Music Players", multiple: true, required: false
-	input "powerMeters", "capability.powerMeter",title: "Power Meters", multiple: true, required: false
-	input "presenceSensors", "capability.presenceSensor",title: "Presence Sensors", multiple: true, required: false
-	input "relativeHumidityMeasurements", "capability.relativeHumidityMeasurement",title: "Humidity Sensors", multiple: true, required: false
-	input "relaySwitches", "capability.relaySwitch",title: "Relays", multiple: true, required: false
-	input "signalStrengths", "capability.signalStrength",title: "Signal Strengths", multiple: true, required: false
-	input "sleepSensors", "capability.sleepSensor",title: "Sleep Sensors", multiple: true, required: false
-	input "smokeDetectors", "capability.smokeDetector",title: "Smoke Detectors", multiple: true, required: false
-	input "speechSyntheses", "capability.speechSynthesis",title: "Speech Syntheses", multiple: true, required: false
-	input "stepSensors", "capability.stepSensor",title: "Step Sensors", multiple: true, required: false
-	input "switches", "capability.switch",title: "Switches", multiple: true, required: false
-	input "switchLevels", "capability.switchLevel",title: "Dimmers", multiple: true, required: false
-	input "temperatureMeasurements", "capability.temperatureMeasurement",title: "Temperature Sensors", multiple: true, required: false
-	input "thermostats", "capability.thermostat",title: "Thermostats", multiple: true, required: false
-	input "threeAxes", "capability.threeAxis",title: "Three axis Sensors", multiple: true, required: false
-	input "tones", "capability.tone",title: "Tones", multiple: true, required: false
-	input "touchSensors", "capability.touchSensor",title: "Touch Sensors", multiple: true, required: false
-	input "valves", "capability.valve",title: "Valves", multiple: true, required: false
-	input "waterSensors", "capability.waterSensor",title: "Water Sensors", multiple: true, required: false
-    }
-}
-
-mappings {
-  path("/GetCurrentValues") {
-    action: [
-      GET: "getCurrentValues"
-    ]
-  }
-  path("/GetCurrentValuesWithDisplayName") {
-    action: [
-      GET: "getCurrentValuesWithDisplayName"
-    ]
-  }
-  path("/GetRoutines") {
-    action: [
-      GET: "getRoutines"
-    ]
-  }
-  path("/ExecuteCommand") {
-    action: [
-      PUT: "executeCommand"
-    ]
-  }
-  path("/ExecuteRoutine") {
-    action: [
-      PUT: "executeRoutine"
-    ]
-  }
-}
-
-def getCurrentValues() {
-    def resp = []    
-        
- 	accelerationSensors.each {
-      resp << [id: it.id, capability: "AccelerationSensor", attribute: "acceleration", value: it.currentValue("acceleration")]
-    }
-
-	alarms.each {
-      resp << [id: it.id, capability: "Alarm", attribute: "alarm", value: it.currentValue("alarm")]
-    }
-
-	batteries.each {
-      resp << [id: it.id, capability: "Battery", attribute: "battery", value: it.currentValue("battery")]
-    }
-
-	beacons.each {
-      resp << [id: it.id, capability: "Beacon", attribute: "presence", value: it.currentValue("presence")]
-    }
-
-	buttonGroup.each {
-      resp << [id: it.id, capability: "Button", attribute: "button", value: it.currentValue("button")]
-    }
-
-	carbonMonoxideDetectors.each {
-      resp << [id: it.id, capability: "CarbonMonoxideDetector", attribute: "carbonMonoxide", value: it.currentValue("carbonMonoxide")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, capability: "ColorControl", attribute: "hue", value: it.currentValue("hue")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, capability: "ColorControl", attribute: "saturation", value: it.currentValue("saturation")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, capability: "ColorControl", attribute: "color", value: it.currentValue("color")]
-    }
-
-	contactSensors.each {
-      resp << [id: it.id, capability: "ContactSensor", attribute: "contact", value: it.currentValue("contact")]
-    }
-
-	doorControls.each {
-      resp << [id: it.id, capability: "DoorControl", attribute: "door", value: it.currentValue("door")]
-    }
-
-	energyMeters.each {
-      resp << [id: it.id, capability: "EnergyMeter", attribute: "energy", value: it.currentValue("energy")]
-    }
-
-	illuminanceMeasurements.each {
-      resp << [id: it.id, capability: "IlluminanceMeasurement", attribute: "illuminance", value: it.currentValue("illuminance")]
-    }
-
-	imageCaptures.each {
-      resp << [id: it.id, capability: "ImageCapture", attribute: "image", value: it.currentValue("image")]
-    }
-
-	locks.each {
-      resp << [id: it.id, capability: "Lock", attribute: "lock", value: it.currentValue("lock")]
-    }
-
-	mediaControllers.each {
-      resp << [id: it.id, capability: "MediaController", attribute: "activities", value: it.currentValue("activities")]
-    }
-
-	mediaControllers.each {
-      resp << [id: it.id, capability: "MediaController", attribute: "currentActivity", value: it.currentValue("currentActivity")]
-    }
-
-	motionSensors.each {
-      resp << [id: it.id, capability: "MotionSensor", attribute: "motion", value: it.currentValue("motion")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, capability: "MusicPlayer", attribute: "status", value: it.currentValue("status")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, capability: "MusicPlayer", attribute: "level", value: it.currentValue("level")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, capability: "MusicPlayer", attribute: "trackDescription", value: it.currentValue("trackDescription")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, capability: "MusicPlayer", attribute: "trackData", value: it.currentValue("trackData")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, capability: "MusicPlayer", attribute: "mute", value: it.currentValue("mute")]
-    }
-
-	powerMeters.each {
-      resp << [id: it.id, capability: "PowerMeter", attribute: "power", value: it.currentValue("power")]
-    }
-
-	presenceSensors.each {
-      resp << [id: it.id, capability: "PresenceSensor", attribute: "presence", value: it.currentValue("presence")]
-    }
-
-	relativeHumidityMeasurements.each {
-      resp << [id: it.id, capability: "RelativeHumidityMeasurement", attribute: "humidity", value: it.currentValue("humidity")]
-    }
-
-	relaySwitches.each {
-      resp << [id: it.id, capability: "RelaySwitch", attribute: "switch", value: it.currentValue("switch")]
-    }
-
-	signalStrengths.each {
-      resp << [id: it.id, capability: "SignalStrength", attribute: "lqi", value: it.currentValue("lqi")]
-    }
-
-	signalStrengths.each {
-      resp << [id: it.id, capability: "SignalStrength", attribute: "rssi", value: it.currentValue("rssi")]
-    }
-
-	sleepSensors.each {
-      resp << [id: it.id, capability: "SleepSensor", attribute: "sleeping", value: it.currentValue("sleeping")]
-    }
-
-	smokeDetectors.each {
-      resp << [id: it.id, capability: "SmokeDetector", attribute: "smoke", value: it.currentValue("smoke")]
-    }
-
-	stepSensors.each {
-      resp << [id: it.id, capability: "StepSensor", attribute: "steps", value: it.currentValue("steps")]
-    }
-
-	stepSensors.each {
-      resp << [id: it.id, capability: "StepSensor", attribute: "goal", value: it.currentValue("goal")]
-    }
-
-	switches.each {
-      resp << [id: it.id, capability: "Switch", attribute: "switch", value: it.currentValue("switch")]
-    }
-
-	switchLevels.each {
-      resp << [id: it.id, capability: "SwitchLevel", attribute: "level", value: it.currentValue("level")]
-    }
-
-	temperatureMeasurements.each {
-      resp << [id: it.id, capability: "TemperatureMeasurement", attribute: "temperature", value: it.currentValue("temperature")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "temperature", value: it.currentValue("temperature")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "heatingSetpoint", value: it.currentValue("heatingSetpoint")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "coolingSetpoint", value: it.currentValue("coolingSetpoint")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "thermostatSetpoint", value: it.currentValue("thermostatSetpoint")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "thermostatMode", value: it.currentValue("thermostatMode")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "thermostatFanMode", value: it.currentValue("thermostatFanMode")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "thermostatOperatingState", value: it.currentValue("thermostatOperatingState")]
-    }
-
-	threeAxes.each {
-      resp << [id: it.id, capability: "ThreeAxis", attribute: "threeAxis", value: it.currentValue("threeAxis")]
-    }
-
-	touchSensors.each {
-      resp << [id: it.id, capability: "TouchSensor", attribute: "touch", value: it.currentValue("touch")]
-    }
-
-	valves.each {
-      resp << [id: it.id, capability: "Valve", attribute: "contact", value: it.currentValue("contact")]
-    }
-
-	waterSensors.each {
-      resp << [id: it.id, capability: "WaterSensor", attribute: "water", value: it.currentValue("water")]
-    }
-   
-   	//resp << [id: 0, capability: "Heartbeat", attribute: "heartbeat", value: String.valueOf(state.heartbeat)]
-    
-    state.heartbeat = !state.heartbeat
-    
-    return resp
-}
-
-def getCurrentValuesWithDisplayName() {
-    def resp = []    
-        
- 	accelerationSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "AccelerationSensor", attribute: "acceleration", value: it.currentValue("acceleration")]
-    }
-
-	alarms.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Alarm", attribute: "alarm", value: it.currentValue("alarm")]
-    }
-
-	batteries.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Battery", attribute: "battery", value: it.currentValue("battery")]
-    }
-
-	beacons.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Beacon", attribute: "presence", value: it.currentValue("presence")]
-    }
-
-	buttonGroup.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Button", attribute: "button", value: it.currentValue("button")]
-    }
-
-	carbonMonoxideDetectors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "CarbonMonoxideDetector", attribute: "carbonMonoxide", value: it.currentValue("carbonMonoxide")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ColorControl", attribute: "hue", value: it.currentValue("hue")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ColorControl", attribute: "saturation", value: it.currentValue("saturation")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ColorControl", attribute: "color", value: it.currentValue("color")]
-    }
-
-	contactSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ContactSensor", attribute: "contact", value: it.currentValue("contact")]
-    }
-
-	doorControls.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "DoorControl", attribute: "door", value: it.currentValue("door")]
-    }
-
-	energyMeters.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "EnergyMeter", attribute: "energy", value: it.currentValue("energy")]
-    }
-
-	illuminanceMeasurements.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "IlluminanceMeasurement", attribute: "illuminance", value: it.currentValue("illuminance")]
-    }
-
-	imageCaptures.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ImageCapture", attribute: "image", value: it.currentValue("image")]
-    }
-
-	locks.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Lock", attribute: "lock", value: it.currentValue("lock")]
-    }
-
-	mediaControllers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MediaController", attribute: "activities", value: it.currentValue("activities")]
-    }
-
-	mediaControllers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MediaController", attribute: "currentActivity", value: it.currentValue("currentActivity")]
-    }
-
-	motionSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MotionSensor", attribute: "motion", value: it.currentValue("motion")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "status", value: it.currentValue("status")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "level", value: it.currentValue("level")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "trackDescription", value: it.currentValue("trackDescription")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "trackData", value: it.currentValue("trackData")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "mute", value: it.currentValue("mute")]
-    }
-
-	powerMeters.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "PowerMeter", attribute: "power", value: it.currentValue("power")]
-    }
-
-	presenceSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "PresenceSensor", attribute: "presence", value: it.currentValue("presence")]
-    }
-
-	relativeHumidityMeasurements.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "RelativeHumidityMeasurement", attribute: "humidity", value: it.currentValue("humidity")]
-    }
-
-	relaySwitches.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "RelaySwitch", attribute: "switch", value: it.currentValue("switch")]
-    }
-
-	signalStrengths.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "SignalStrength", attribute: "lqi", value: it.currentValue("lqi")]
-    }
-
-	signalStrengths.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "SignalStrength", attribute: "rssi", value: it.currentValue("rssi")]
-    }
-
-	sleepSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "SleepSensor", attribute: "sleeping", value: it.currentValue("sleeping")]
-    }
-
-	smokeDetectors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "SmokeDetector", attribute: "smoke", value: it.currentValue("smoke")]
-    }
-
-	stepSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "StepSensor", attribute: "steps", value: it.currentValue("steps")]
-    }
-
-	stepSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "StepSensor", attribute: "goal", value: it.currentValue("goal")]
-    }
-
-	switches.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Switch", attribute: "switch", value: it.currentValue("switch")]
-    }
-
-	switchLevels.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "SwitchLevel", attribute: "level", value: it.currentValue("level")]
-    }
-
-	temperatureMeasurements.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "TemperatureMeasurement", attribute: "temperature", value: it.currentValue("temperature")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "temperature", value: it.currentValue("temperature")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "heatingSetpoint", value: it.currentValue("heatingSetpoint")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "coolingSetpoint", value: it.currentValue("coolingSetpoint")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatSetpoint", value: it.currentValue("thermostatSetpoint")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatMode", value: it.currentValue("thermostatMode")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatFanMode", value: it.currentValue("thermostatFanMode")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatOperatingState", value: it.currentValue("thermostatOperatingState")]
-    }
-
-	threeAxes.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ThreeAxis", attribute: "threeAxis", value: it.currentValue("threeAxis")]
-    }
-
-	touchSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "TouchSensor", attribute: "touch", value: it.currentValue("touch")]
-    }
-
-	valves.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Valve", attribute: "contact", value: it.currentValue("contact")]
-    }
-
-	waterSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "WaterSensor", attribute: "water", value: it.currentValue("water")]
-    }
-   
-    momentaries.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Momentary", attribute: "", value: ""]
-    }
-   
-    //resp << [id: 0, displayName: "Heartbeat", capability: "Heartbeat", attribute: "heartbeat", value: state.heartbeat]
-    
-    return resp
-}
-
-def getDevices(capability){
-
-	def result
-
-	switch (capability) {
-    	case "Alarm":
-        	result = alarms
-        	break
-    	case "ColorControl":
-        	result = colorControls
-        	break
-    	case "DoorControl":
-        	result = doorControls
-        	break
-        case "ImageCapture":
-        	result = imageCaptures
-        	break
-    	case "Lock":
-        	result = locks
-        	break
-        case "MediaController":
-        	result = mediaControllers
-        	break
-    	case "Momentary":
-        	result = momentaries
-        	break
-        case "MusicPlayer":
-        	result = musicPlayers
-        	break
-        case "RelaySwitch":
-        	result = relaySwitches
-        	break
-    	case "SpeechSynthesis":
-        	result = speechSyntheses
-        	break
-    	case "Switch":
-        	result = switches
-        	break
-        case "SwitchLevel":
-        	result = switchLevels
-        	break
-    	case "Thermostat":
-        	result = thermostats
-        	break
-		case "ThermostatCoolingSetpoint":
-        	result = thermostatCoolingSetpoints
-        	break
-    	case "ThermostatFanMode":
-        	result = thermostatFanModes
-        	break
-        case "ThermostatHeatingSetpoint":
-        	result = thermostatHeatingSetpoints
-        	break
-    	case "ThermostatMode":
-        	result = thermostatModes
-        	break
-    	case "Tone":
-        	result = tones
-        	break
-        case "Valve":
-        	result = valves
-        	break     
-    	default:
-        	result = valves
-	}
-	return result
-}
-
-def getDoorControlCommand(value){
-	def result
-	switch (value) {
-        case "closed":
-        	result = "close"
-        	break
-    	case "open":
-        	result = "open"
-        	break
-    	default:
-        	result = value
-	}    
-	return result
-}
-
-def getLockCommand(value){
-	def result
-	switch (value) {
-        case "locked":
-        	result = "lock"
-        	break
-    	case "unlocked":
-        	result = "unlock"
-        	break
-    	default:
-        	result = value
-	}    
-	return result
-}
-
-def getMuteCommand(value){
-	def result
-	switch (value) {
-        case "muted":
-        	result = "mute"
-        	break
-    	case "unmuted":
-        	result = "unmute"
-        	break
-    	default:
-        	result = value
-	}    
-	return result
-}
-
-def getContactCommand(value){
-	def result
-	switch (value) {
-        case "closed":
-        	result = "close"
-        	break
-    	case "open":
-        	result = "open"
-        	break
-    	default:
-        	result = value
-	}    
-	return result
-}
-
-def getRoutines() {
-	return location.helloHome?.getPhrases()*.label
-}
-
-def getThermostatFanModeCommand(value){
-	def result
-	switch (value) {
-        case "on":
-        	result = "fanOn"
-        	break
-    	case "auto":
-        	result = "fanAuto"
-        	break
-    	case "circulate":
-        	result = "fanCirculate"
-        	break
-    	default:
-        	result = value
-	}    
-	return result
-}
-
-void executeCommand() {    
-    def deviceId = request.JSON?.deviceId
-    def capability = request.JSON?.capability
-    def attribute = request.JSON?.attribute 
-    def value = request.JSON?.value    
-    if (deviceId) {
-		def devices = getDevices(capability)
-        def command
-        def valueIsParameter = false
-        def valueIsInteger = false
-        switch (attribute) {    	       	
-        	case "hue":
-        		command = "setHue"
-                valueIsParameter = true
-                valueIsInteger = true
-        		break
-    		case "saturation":
-        		command = "setSaturation"
-                valueIsParameter = true
-                valueIsInteger = true
-        		break
-    		case "color":
-        		command = "setColor"
-                def rgb = hexToRgb(value)
-                def hsl = rgbToHSL(rgb)
-                value = [hue:hsl.h.toInteger(), saturation:hsl.s.toInteger()]
-                valueIsParameter = true				
-        		break
-			case "level":
-        		command = "setLevel"
-                valueIsParameter = true
-                valueIsInteger = true
-        		break            
-        	case "heatingSetpoint":
-        		command = "setHeatingSetpoint"
-                valueIsParameter = true
-        		break    
-       		case "coolingSetpoint":
-        		command = "setCoolingSetpoint"
-                valueIsParameter = true
-        		break
-          	case "currentActivity":
-        		command = "startActivity"
-                valueIsParameter = true
-        		break  
- 	  		case "door":
-        		command = getDoorControlCommand(value)
-        		break    
-      		case "lock":
-        		command = getLockCommand(value)
-        		break           
-      		case "mute":
-        		command = getMuteCommand(value)
-        		break         
-      		case "thermostatFanMode":
-        		command = getThermostatFanModeCommand(value)
-        		break         
-       		case "thermostatMode":
-        		if (value == "emergency heat") {
-                	command = "emergencyHeat"
-           		}
-                else
-                {
-                    command = value
-                }
-        		break     
-      		case "contact":
-        		command = getContactCommand(value)
-        		break
-    		default:
-        		command = value
-		}
-        devices.each {
-        	if (it.id == deviceId) {
-                // check that the device supports the specified command
-                // If not, return an error using httpError, providing a HTTP status code.
-            	if (!it.hasCommand(command)) {
-                	httpError(501, "$command is not a valid command for the device")
-            	}                
-                if(valueIsParameter){
-                	if(valueIsInteger){
-                		it."$command"(value as int)
-                	}
-                	else{
-                		it."$command"(value)
-                	}   
-                }
-                else{
-                	it."$command"()
-                }   
-           }       
-        }
-    }
-}
-
-void executeRoutine() {   
-	def routine = request.JSON?.routine
-    location.helloHome?.execute(routine)
-}
-
-def rgbToHSL(rgb) {
-	def r = rgb.r / 255
-    def g = rgb.g / 255
-    def b = rgb.b / 255
-    def h = 0
-    def s = 0
-    def l = 0
-    
-    def var_min = [r,g,b].min()
-    def var_max = [r,g,b].max()
-    def del_max = var_max - var_min
-    
-    l = (var_max + var_min) / 2
-    
-    if (del_max == 0) {
-            h = 0
-            s = 0
-    } else {
-    	if (l < 0.5) { s = del_max / (var_max + var_min) } 
-        else { s = del_max / (2 - var_max - var_min) }
-
-        def del_r = (((var_max - r) / 6) + (del_max / 2)) / del_max
-        def del_g = (((var_max - g) / 6) + (del_max / 2)) / del_max
-        def del_b = (((var_max - b) / 6) + (del_max / 2)) / del_max
-
-        if (r == var_max) { h = del_b - del_g } 
-        else if (g == var_max) { h = (1 / 3) + del_r - del_b } 
-        else if (b == var_max) { h = (2 / 3) + del_g - del_r }
-        
-		if (h < 0) { h += 1 }
-        if (h > 1) { h -= 1 }
-	}
-    def hsl = [:]    
-    hsl = [h: h * 100, s: s * 100, l: l]
-    
-    hsl
-}
-
-def hexToRgb(colorHex) {
-	def rrInt = Integer.parseInt(colorHex.substring(1,3),16)
-    def ggInt = Integer.parseInt(colorHex.substring(3,5),16)
-    def bbInt = Integer.parseInt(colorHex.substring(5,7),16)
-    
-    def colorData = [:]
-    colorData = [r: rrInt, g: ggInt, b: bbInt]
-    colorData
-}
-
-def installed() {
-	state.heartbeat = false
-}
-
-def updated() {
-	state.heartbeat = false
-}