MSA-1393: Home Remote for PC

[CHF-138] Adds HealthCheck to Z-Wave Sensors

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

@@ -22,6 +22,7 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"
 
 		attribute "tamper", "enum", ["detected", "clear"]
 		attribute "batteryStatus", "string"
@@ -326,6 +327,9 @@ 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)
+
 	// This sensor joins as a secure device if you double-click the button to include it
 	log.debug "${device.displayName} is configuring its settings"
 	def request = []

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

@@ -20,6 +20,9 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"
+
+		command "configureAfterSecure"
 
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x98,0x7A", outClusters:"0x5A"
 	}
@@ -245,6 +248,8 @@ def configureAfterSecure() {
 def configure() {
 	// log.debug "configure()"
     //["delay 30000"] + secure(zwave.securityV1.securityCommandsSupportedGet())
+	// allow device 16 min to check in; double the periodic reporting interval
+	sendEvent(name: "checkInterval", value: 2*8*60, displayed: false)
 }
 
 private setConfigured() {

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

@@ -20,6 +20,7 @@ metadata {
 		capability "Illuminance Measurement"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"
 
 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x31,0x80,0x84,0x70,0x85,0x72,0x86"
 	}
@@ -180,6 +181,9 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def configure() {
+	// allow device 10 min to check in; double the periodic reporting interval
+	sendEvent(name: "checkInterval", value: 2*5*60, displayed: false)
+
 	delayBetween([
 		// send binary sensor report instead of basic set for motion
 		zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2).format(),

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

@@ -15,12 +15,13 @@
  */
  
 metadata {
-	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
 		capability "Battery"
 		capability "Configuration"
 		capability "Contact Sensor"
 		capability "Refresh"
 		capability "Temperature Measurement"
+		capability "Health Check"
         
 		command "enrollResponse"
  
@@ -273,7 +274,8 @@ 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/zwave-door-window-sensor.src/zwave-door-window-sensor.groovy

@@ -28,7 +28,7 @@ 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,0x86,0x84,0x85,0x59,0x71,0x70,0x7A,0x98" // Vision door/window
+		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x72,0x5A,0x80,0x73,0x84,0x85,0x59,0x71,0x70,0x7A,0x98" // Vision door/window
 	}
 
 	// simulator metadata
@@ -81,22 +81,22 @@ def updated() {
 	def cmds = []
 	if (!state.MSR) {
 		cmds = [
-			zwave.manufacturerSpecificV2.manufacturerSpecificGet().format(),
+			command(zwave.manufacturerSpecificV2.manufacturerSpecificGet()),
 			"delay 1200",
-			zwave.wakeUpV1.wakeUpNoMoreInformation().format()
+			zwave.wakeUpV1.wakeUpNoMoreInformation()
 		]
 	} else if (!state.lastbat) {
 		cmds = []
 	} else {
-		cmds = [zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
+		cmds = [zwave.wakeUpV1.wakeUpNoMoreInformation()]
 	}
 	response(cmds)
 }
 
 def configure() {
-	delayBetween([
-		zwave.manufacturerSpecificV2.manufacturerSpecificGet().format(),
-		batteryGetCommand()
+	commands([
+		zwave.manufacturerSpecificV2.manufacturerSpecificGet(),
+		zwave.batteryV1.batteryGet()
 	], 6000)
 }
 
@@ -147,12 +147,11 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
 			result << sensorValueEvent(1)
 		} else if (cmd.event == 0x03) {
 			result << createEvent(descriptionText: "$device.displayName covering was removed", isStateChange: true)
-			result << response(zwave.wakeUpV1.wakeUpIntervalSet(seconds:4*3600, nodeid:zwaveHubNodeId))
-			if(!state.MSR) result << response(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
+			if(!state.MSR) result << response(command(zwave.manufacturerSpecificV2.manufacturerSpecificGet()))
 		} else if (cmd.event == 0x05 || cmd.event == 0x06) {
 			result << createEvent(descriptionText: "$device.displayName detected glass breakage", isStateChange: true)
 		} else if (cmd.event == 0x07) {
-			if(!state.MSR) result << response(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
+			if(!state.MSR) result << response(command(zwave.manufacturerSpecificV2.manufacturerSpecificGet()))
 			result << createEvent(name: "motion", value: "active", descriptionText:"$device.displayName detected motion")
 		}
 	} else if (cmd.notificationType) {
@@ -170,14 +169,13 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
 	def event = createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)
 	def cmds = []
 	if (!state.MSR) {
-		cmds << zwave.wakeUpV1.wakeUpIntervalSet(seconds:4*3600, nodeid:zwaveHubNodeId).format()
-		cmds << zwave.manufacturerSpecificV2.manufacturerSpecificGet().format()
+		cmds << command(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
 		cmds << "delay 1200"
 	}
 	if (!state.lastbat || now() - state.lastbat > 53*60*60*1000) {
-		cmds << batteryGetCommand()
+		cmds << command(zwave.batteryV1.batteryGet())
 	} else {
-		cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
+		cmds << zwave.wakeUpV1.wakeUpNoMoreInformation()
 	}
 	[event, response(cmds)]
 }
@@ -212,7 +210,7 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 		if (msr == "0086-0102-0059") {
 			result << response(zwave.securityV1.securityMessageEncapsulation().encapsulate(zwave.batteryV1.batteryGet()).format())
 		} else {
-			result << response(batteryGetCommand())
+			result << response(command(zwave.batteryV1.batteryGet()))
 		}
 	}
 
@@ -220,7 +218,7 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
-	def encapsulatedCommand = cmd.encapsulatedCommand([0x20: 1, 0x85: 2, 0x70: 1])
+	def encapsulatedCommand = cmd.encapsulatedCommand([0x20: 1, 0x25: 1, 0x30: 1, 0x31: 5, 0x80: 1, 0x84: 1, 0x71: 3, 0x9C: 1])
 	// log.debug "encapsulated: $encapsulatedCommand"
 	if (encapsulatedCommand) {
 		state.sec = 1
@@ -232,12 +230,16 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	createEvent(descriptionText: "$device.displayName: $cmd", displayed: false)
 }
 
-def batteryGetCommand() {
-	def cmd = zwave.batteryV1.batteryGet()
-	if (state.sec) {
-		cmd = zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd)
+private command(physicalgraph.zwave.Command cmd) {
+	if (state.sec == 1) {
+		zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
+	} else {
+		cmd.format()
 	}
-	cmd.format()
+}
+
+private commands(commands, delay=200) {
+	delayBetween(commands.collect{ command(it) }, delay)
 }
 
 def retypeBasedOnMSR() {
@@ -260,8 +262,12 @@ def retypeBasedOnMSR() {
 			setDeviceType("3-in-1 Multisensor Plus (SG)")
 			break
 		case "0109-2001-0106":  // Vision door/window
-			log.debug "Changing device type to Door / Window Sensor Plus (SG)"
-			setDeviceType("Door / Window Sensor Plus (SG)")
+			log.debug "Changing device type to Z-Wave Plus Door/Window Sensor"
+			setDeviceType("Z-Wave Plus Door/Window Sensor")
+			break
+		case "0109-2002-0205": // Vision Motion
+			log.debug "Changing device type to Z-Wave Plus Motion/Temp Sensor"
+			setDeviceType("Z-Wave Plus Motion/Temp Sensor")
 			break
 	}
 }

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

@@ -0,0 +1,270 @@
+/**
+*	Copyright 2016 SmartThings
+*	Copyright 2015 AstraLink
+*
+*	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.
+*
+*	Z-Wave Plus Door/Window Sensor, ZD2102*-5
+*
+*/
+
+metadata {
+	definition (name: "Z-Wave Plus Door/Window Sensor", namespace: "smartthings", author: "SmartThings") {
+		capability "Contact Sensor"
+		capability "Configuration"
+		capability "Battery"
+		capability "Sensor"
+
+		// for Astralink
+		attribute "ManufacturerCode", "string"
+		attribute "ProduceTypeCode", "string"
+		attribute "ProductCode", "string"
+		attribute "WakeUp", "string"
+		attribute "WirelessConfig", "string"
+
+		fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x98, 0x86, 0x72, 0x5A, 0x85, 0x59, 0x73, 0x80, 0x71, 0x70, 0x84, 0x7A"
+		fingerprint type:"8C07", inClusters: "5E,98,86,72,5A,71"
+		fingerprint mfr:"0109", prod:"2001", model:"0106"  // not using deviceJoinName because it's sold under different brand names
+	}
+
+	tiles(scale: 2) {
+		multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4){
+			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+				attributeState "open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
+				attributeState "closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
+			}
+		}
+		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
+			state "battery", label:'${currentValue}% battery', unit:""
+		}
+
+		main (["contact"])
+		details(["contact","battery"])
+	}
+
+	simulator {
+		// messages the device returns in response to commands it receives
+		status "open (basic)" : "command: 9881, payload: 00 20 01 FF"
+		status "closed (basic)" : "command: 9881 payload: 00 20 01 00"
+		status "open (notification)" : "command: 9881, payload: 00 71 05 06 FF 00 FF 06 16 00 00"
+		status "closed (notification)" : "command: 9881, payload: 00 71 05 06 00 00 FF 06 17 00 00"
+		status "tamper: enclosure opened" : "command: 9881, payload: 00 71 05 07 FF 00 FF 07 03 00 00"
+		status "tamper: enclosure replaced" : "command: 9881, payload: 00 71 05 07 00 00 FF 07 00 00 00"
+		status "wake up" : "command: 9881, payload: 00 84 07"
+		status "battery (100%)" : "command: 9881, payload: 00 80 03 64"
+		status "battery low" : "command: 9881, payload: 00 80 03 FF"
+	}
+}
+
+def configure() {
+	log.debug "configure()"
+	def cmds = []
+
+	if (state.sec != 1) {
+		// secure inclusion may not be complete yet
+		cmds << "delay 1000"
+	}
+
+	cmds += secureSequence([
+		zwave.manufacturerSpecificV2.manufacturerSpecificGet(),
+		zwave.batteryV1.batteryGet(),
+	], 500)
+
+	cmds << "delay 8000"
+	cmds << secure(zwave.wakeUpV1.wakeUpNoMoreInformation())
+	return cmds
+}
+
+private getCommandClassVersions() {
+	[
+		0x71: 3,  // Notification
+		0x5E: 2,  // ZwaveplusInfo
+		0x59: 1,  // AssociationGrpInfo
+		0x85: 2,  // Association
+		0x20: 1,  // Basic
+		0x80: 1,  // Battery
+		0x70: 1,  // Configuration
+		0x5A: 1,  // DeviceResetLocally
+		0x7A: 2,  // FirmwareUpdateMd
+		0x72: 2,  // ManufacturerSpecific
+		0x73: 1,  // Powerlevel
+		0x98: 1,  // Security
+		0x84: 2,  // WakeUp
+		0x86: 1,  // Version
+	]
+}
+
+// Parse incoming device messages to generate events
+def parse(String description) {
+	def result = []
+	def cmd
+	if (description.startsWith("Err 106")) {
+		state.sec = 0
+		result = createEvent( name: "secureInclusion", value: "failed", eventType: "ALERT",
+				descriptionText: "This sensor failed to complete the network security key exchange. If you are unable to control it via SmartThings, you must remove it from your network and add it again.")
+	} else if (description.startsWith("Err")) {
+		result = createEvent(descriptionText: "$device.displayName $description", isStateChange: true)
+	} else {
+		cmd = zwave.parse(description, commandClassVersions)
+		if (cmd) {
+			result = zwaveEvent(cmd)
+		}
+	}
+
+	if (result instanceof List) {
+		result = result.flatten()
+	}
+
+	log.debug "Parsed '$description' to $result"
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
+	def encapsulatedCommand = cmd.encapsulatedCommand(commandClassVersions)
+	log.debug "encapsulated: $encapsulatedCommand"
+	if (encapsulatedCommand) {
+		state.sec = 1
+		return zwaveEvent(encapsulatedCommand)
+	} else {
+		log.warn "Unable to extract encapsulated cmd from $cmd"
+		return [createEvent(descriptionText: cmd.toString())]
+	}
+}
+
+def sensorValueEvent(value) {
+	if (value) {
+		createEvent(name: "contact", value: "open", descriptionText: "$device.displayName is open")
+	} else {
+		createEvent(name: "contact", value: "closed", descriptionText: "$device.displayName is closed")
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
+	return sensorValueEvent(cmd.value)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
+	return sensorValueEvent(cmd.value)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensorbinaryv2.SensorBinaryReport cmd) {
+	return sensorValueEvent(cmd.sensorValue)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensoralarmv1.SensorAlarmReport cmd) {
+	return sensorValueEvent(cmd.sensorState)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cmd) {
+	def result = []
+	if (cmd.notificationType == 0x06 && cmd.event == 0x16) {
+		result << sensorValueEvent(1)
+	} else if (cmd.notificationType == 0x06 && cmd.event == 0x17) {
+		result << sensorValueEvent(0)
+	} else if (cmd.notificationType == 0x07) {
+		if (cmd.event == 0x00) {
+			if (cmd.eventParametersLength == 0 || cmd.eventParameter[0] != 3) {
+				result << createEvent(descriptionText: "$device.displayName covering replaced", isStateChange: true, displayed: false)
+			} else {
+				result << sensorValueEvent(0)
+			}
+		} else if (cmd.event == 0x01 || cmd.event == 0x02) {
+			result << sensorValueEvent(1)
+		} else if (cmd.event == 0x03) {
+			result << createEvent(descriptionText: "$device.displayName covering was removed", isStateChange: true)
+			if (!device.currentState("ManufacturerCode")) {
+				result << response(secure(zwave.manufacturerSpecificV2.manufacturerSpecificGet()))
+			}
+		} else if (cmd.event == 0x05 || cmd.event == 0x06) {
+			result << createEvent(descriptionText: "$device.displayName detected glass breakage", isStateChange: true)
+		} else {
+			result << createEvent(descriptionText: "$device.displayName event $cmd.event ${cmd.eventParameter.inspect()}", isStateChange: true, displayed: false)
+		}
+	} else if (cmd.notificationType) {
+		result << createEvent(descriptionText: "$device.displayName notification $cmd.notificationType event $cmd.event ${cmd.eventParameter.inspect()}", isStateChange: true, displayed: false)
+	} else {
+		def value = cmd.v1AlarmLevel == 255 ? "active" : cmd.v1AlarmLevel ?: "inactive"
+		result << createEvent(name: "alarm $cmd.v1AlarmType", value: value, isStateChange: true, displayed: false)
+	}
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
+	def event = createEvent(name: "WakeUp", value: "wakeup", descriptionText: "${device.displayName} woke up", isStateChange: true, displayed: false)  // for Astralink
+	def cmds = []
+
+	if (!device.currentState("ManufacturerCode")) {
+		cmds << secure(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
+		cmds << "delay 2000"
+	}
+	if (!state.lastbat || now() - state.lastbat > 10*60*60*1000) {
+		event.descriptionText += ", requesting battery"
+		cmds << secure(zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType:1, scale:1))
+		cmds << "delay 800"
+		cmds << secure(zwave.batteryV1.batteryGet())
+		cmds << "delay 2000"
+	} else {
+		log.debug "not checking battery, was updated ${(now() - state.lastbat)/60000 as int} min ago"
+	}
+	cmds << secure(zwave.wakeUpV1.wakeUpNoMoreInformation())
+
+	return [event, response(cmds)]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
+	def map = [ name: "battery", unit: "%" ]
+	if (cmd.batteryLevel == 0xFF) {
+		map.value = 1
+		map.descriptionText = "${device.displayName} has a low battery"
+		map.isStateChange = true
+	} else {
+		map.value = cmd.batteryLevel
+	}
+	def event = createEvent(map)
+
+	// Save at least one battery report in events list every few days
+	if (!event.isStateChange && (now() - 3*24*60*60*1000) > device.latestState("battery")?.date?.time) {
+		map.isStateChange = true
+	}
+	state.lastbat = now()
+	return [event]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+	def result = []
+	def manufacturerCode = String.format("%04X", cmd.manufacturerId)
+	def productTypeCode = String.format("%04X", cmd.productTypeId)
+	def productCode = String.format("%04X", cmd.productId)
+	def wirelessConfig = "ZWP"
+	log.debug "MSR ${manufacturerCode} ${productTypeCode} ${productCode}"
+
+	result << createEvent(name: "ManufacturerCode", value: manufacturerCode)
+	result << createEvent(name: "ProduceTypeCode", value: productTypeCode)
+	result << createEvent(name: "ProductCode", value: productCode)
+	result << createEvent(name: "WirelessConfig", value: wirelessConfig)
+
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	return [createEvent(descriptionText: "$device.displayName: $cmd", displayed: false)]
+}
+
+private secure(physicalgraph.zwave.Command cmd) {
+	if (state.sec == 0) {  // default to secure
+		cmd.format()
+	} else {
+		zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
+	}
+}
+
+private secureSequence(commands, delay=200) {
+	delayBetween(commands.collect{ secure(it) }, delay)
+}

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

@@ -0,0 +1,327 @@
+/**
+*	Copyright 2016 SmartThings
+*	Copyright 2015 AstraLink
+*
+*	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.
+*
+*	Z-Wave Plus Motion Sensor with Temperature Measurement, ZP3102*-5
+*
+*/
+
+metadata {
+	definition (name: "Z-Wave Plus Motion/Temp Sensor", namespace: "smartthings", author: "SmartThings") {
+		capability "Motion Sensor"
+		capability "Temperature Measurement"
+		capability "Configuration"
+		capability "Battery"
+		capability "Sensor"
+
+		// for Astralink
+		attribute "ManufacturerCode", "string"
+		attribute "ProduceTypeCode", "string"
+		attribute "ProductCode", "string"
+		attribute "WakeUp", "string"
+		attribute "WirelessConfig", "string"
+				
+		fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x98, 0x86, 0x72, 0x5A, 0x85, 0x59, 0x73, 0x80, 0x71, 0x31, 0x70, 0x84, 0x7A"
+		fingerprint type:"8C07", inClusters: "5E,98,86,72,5A,31,71"
+		fingerprint mfr:"0109", prod:"2002", model:"0205"  // not using deviceJoinName because it's sold under different brand names
+	}
+
+	tiles {
+		standardTile("motion", "device.motion", width: 3, height: 2) {
+			state "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
+			state "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
+		}
+
+		valueTile("temperature", "device.temperature", inactiveLabel: false) {
+			state "temperature", label:'${currentValue}°',
+				backgroundColors:[
+					[value: 31, color: "#153591"],
+					[value: 44, color: "#1e9cbb"],
+					[value: 59, color: "#90d2a7"],
+					[value: 74, color: "#44b621"],
+					[value: 84, color: "#f1d801"],
+					[value: 95, color: "#d04e00"],
+					[value: 96, color: "#bc2323"]
+				]
+		}
+		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat") {
+			state "battery", label:'${currentValue}% battery', unit:"%"
+		}
+
+		main(["motion", "temperature"])
+		details(["motion", "temperature", "battery"])
+	}
+}
+
+def updated() {
+	if (!device.currentState("ManufacturerCode")) {
+		response(secure(zwave.manufacturerSpecificV2.manufacturerSpecificGet()))
+	}
+}
+
+def configure() {
+	log.debug "configure()"
+	def cmds = []
+
+	if (state.sec != 1) {
+		// secure inclusion may not be complete yet
+		cmds << "delay 1000"
+	}
+
+	cmds += secureSequence([
+		zwave.manufacturerSpecificV2.manufacturerSpecificGet(),
+		zwave.batteryV1.batteryGet(),
+		zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType:1, scale:1)
+	], 500)
+
+	cmds << "delay 8000"
+	cmds << secure(zwave.wakeUpV1.wakeUpNoMoreInformation())
+	return cmds
+}
+
+private getCommandClassVersions() {
+	[
+		0x71: 3,  // Notification
+		0x5E: 2,  // ZwaveplusInfo
+		0x59: 1,  // AssociationGrpInfo
+		0x85: 2,  // Association
+		0x20: 1,  // Basic
+		0x80: 1,  // Battery
+		0x70: 1,  // Configuration
+		0x5A: 1,  // DeviceResetLocally
+		0x7A: 2,  // FirmwareUpdateMd
+		0x72: 2,  // ManufacturerSpecific
+		0x73: 1,  // Powerlevel
+		0x98: 1,  // Security
+		0x31: 5,  // SensorMultilevel
+		0x84: 2	  // WakeUp
+	]
+}
+
+// Parse incoming device messages to generate events
+def parse(String description) {
+	def result = []
+	def cmd
+	if (description.startsWith("Err 106")) {
+		state.sec = 0
+		result = createEvent( name: "secureInclusion", value: "failed", eventType: "ALERT",
+				descriptionText: "This sensor failed to complete the network security key exchange. If you are unable to control it via SmartThings, you must remove it from your network and add it again.")
+	} else if (description.startsWith("Err")) {
+		result = createEvent(descriptionText: "$device.displayName $description", isStateChange: true)
+	} else {
+		cmd = zwave.parse(description, commandClassVersions)
+		if (cmd) {
+			result = zwaveEvent(cmd)
+		}
+	}
+
+	if (result instanceof List) {
+		result = result.flatten()
+	}
+
+	log.debug "Parsed '$description' to $result"
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
+	def encapsulatedCommand = cmd.encapsulatedCommand(commandClassVersions)
+	log.debug "encapsulated: $encapsulatedCommand"
+	if (encapsulatedCommand) {
+		state.sec = 1
+		return zwaveEvent(encapsulatedCommand)
+	} else {
+		log.warn "Unable to extract encapsulated cmd from $cmd"
+		return [createEvent(descriptionText: cmd.toString())]
+	}
+}
+
+def sensorValueEvent(value) {
+	def result = []
+	if (value) {
+		log.debug "sensorValueEvent($value) : active"
+		result << createEvent(name: "motion", value: "active", descriptionText: "$device.displayName detected motion")
+	} else {
+		log.debug "sensorValueEvent($value) : inactive"
+		result << createEvent(name: "motion", value: "inactive", descriptionText: "$device.displayName motion has stopped")
+	}
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
+	return sensorValueEvent(cmd.value)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
+	return sensorValueEvent(cmd.value)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd) {
+	return sensorValueEvent(cmd.value)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensorbinaryv2.SensorBinaryReport cmd) {
+	return sensorValueEvent(cmd.sensorValue)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensoralarmv1.SensorAlarmReport cmd) {
+	return sensorValueEvent(cmd.sensorState)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cmd) {
+	def result = []
+	if (cmd.notificationType == 0x07) {
+		if (cmd.event == 0x01 || cmd.event == 0x02) {
+			result << sensorValueEvent(1)
+		} else if (cmd.event == 0x03) {
+			result << createEvent(descriptionText: "$device.displayName covering was removed", isStateChange: true)
+			result << response(secure(zwave.manufacturerSpecificV2.manufacturerSpecificGet()))
+		} else if (cmd.event == 0x05 || cmd.event == 0x06) {
+			result << createEvent(descriptionText: "$device.displayName detected glass breakage", isStateChange: true)
+		} else if (cmd.event == 0x07) {
+			result << sensorValueEvent(1)
+		} else if (cmd.event == 0x08) {
+			result << sensorValueEvent(1)
+		} else if (cmd.event == 0x00) {
+			if (cmd.eventParametersLength && cmd.eventParameter[0] == 3) {
+				result << createEvent(descriptionText: "$device.displayName covering replaced", isStateChange: true, displayed: false)
+			} else {
+				result << sensorValueEvent(0)
+			}
+		} else if (cmd.event == 0xFF) {
+			result << sensorValueEvent(1)
+		} else {
+			result << createEvent(descriptionText: "$device.displayName sent event $cmd.event")
+		}
+	} else if (cmd.notificationType) {
+		def text = "Notification $cmd.notificationType: event ${([cmd.event] + cmd.eventParameter).join(", ")}"
+		result << createEvent(name: "notification$cmd.notificationType", value: "$cmd.event", descriptionText: text, displayed: false)
+	} else {
+		def value = cmd.v1AlarmLevel == 255 ? "active" : cmd.v1AlarmLevel ?: "inactive"
+		result << createEvent(name: "alarm $cmd.v1AlarmType", value: value, displayed: false)
+	}
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
+	def event = createEvent(name: "WakeUp", value: "wakeup", descriptionText: "${device.displayName} woke up", isStateChange: true, displayed: false)  // for Astralink
+	def cmds = []
+
+	if (!device.currentState("ManufacturerCode")) {
+		cmds << secure(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
+		cmds << "delay 2000"
+	}
+	if (!state.lastbat || now() - state.lastbat > 10*60*60*1000) {
+		event.descriptionText += ", requesting battery"
+		cmds << secure(zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType:1, scale:1))
+		cmds << "delay 800"
+		cmds << secure(zwave.batteryV1.batteryGet())
+		cmds << "delay 2000"
+	} else {
+		log.debug "not checking battery, was updated ${(now() - state.lastbat)/60000 as int} min ago"
+	}
+	cmds << secure(zwave.wakeUpV1.wakeUpNoMoreInformation())
+
+	return [event, response(cmds)]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
+	def result = []
+	def map = [ name: "battery", unit: "%" ]
+	if (cmd.batteryLevel == 0xFF) {
+		map.value = 1
+		map.descriptionText = "${device.displayName} has a low battery"
+		map.isStateChange = true
+	} else {
+		map.value = cmd.batteryLevel
+	}
+	def event = createEvent(map)
+
+	// Save at least one battery report in events list every few days
+	if (!event.isStateChange && (now() - 3*24*60*60*1000) > device.latestState("battery")?.date?.time) {
+		map.isStateChange = true
+	}
+	state.lastbat = now()
+	return [event]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd) {
+	def result = []
+	def map = [:]
+	switch (cmd.sensorType) {
+		case 1:
+			def cmdScale = cmd.scale == 1 ? "F" : "C"
+			map.name = "temperature"
+			map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmdScale, cmd.precision)
+			map.unit = getTemperatureScale()
+			break;
+		case 3:
+			map.name = "illuminance"
+			map.value = cmd.scaledSensorValue.toInteger().toString()
+			map.unit = "lux"
+			break;
+		case 5:
+			map.name = "humidity"
+			map.value = cmd.scaledSensorValue.toInteger().toString()
+			map.unit = cmd.scale == 0 ? "%" : ""
+			break;
+		case 0x1E:
+			map.name = "loudness"
+			map.unit = cmd.scale == 1 ? "dBA" : "dB"
+			map.value = cmd.scaledSensorValue.toString()
+			break;
+		default:
+			map.descriptionText = cmd.toString()
+	}
+	result << createEvent(map)
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+	def result = []
+	def manufacturerCode = String.format("%04X", cmd.manufacturerId)
+	def productTypeCode = String.format("%04X", cmd.productTypeId)
+	def productCode = String.format("%04X", cmd.productId)
+	def wirelessConfig = "ZWP"
+	log.debug "MSR ${manufacturerCode} ${productTypeCode} ${productCode}"
+	
+	result << createEvent(name: "ManufacturerCode", value: manufacturerCode)
+	result << createEvent(name: "ProduceTypeCode", value: productTypeCode)
+	result << createEvent(name: "ProductCode", value: productCode)
+	result << createEvent(name: "WirelessConfig", value: wirelessConfig)
+
+	if (manufacturerCode == "0109" && productTypeCode == "2002") {
+		result << response(secureSequence([
+			// Change re-trigger duration to 1 minute
+			zwave.configurationV1.configurationSet(parameterNumber: 1, configurationValue: [1], size: 1),
+			zwave.batteryV1.batteryGet(),
+			zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType:1, scale:1)
+		], 400))
+	}
+
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	return [createEvent(descriptionText: "$device.displayName: $cmd", displayed: false)]
+}
+
+private secure(physicalgraph.zwave.Command cmd) {
+	if (state.sec == 0) {  // default to secure
+		cmd.format()
+	} else {
+		zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
+	}
+}
+
+private secureSequence(commands, delay=200) {
+	delayBetween(commands.collect{ secure(it) }, delay)
+}

smartapps/dianoga/netatmo-connect.src/netatmo-connect.groovy

@@ -337,10 +337,10 @@ def initialize() {
 
 	settings.devices.each {
 		def deviceId = it
-		def detail = state.deviceDetail[deviceId]
+		def detail = state?.deviceDetail[deviceId]
 
 		try {
-			switch(detail.type) {
+			switch(detail?.type) {
 				case 'NAMain':
 					log.debug "Base station"
 					createChildDevice("Netatmo Basestation", deviceId, "${detail.type}.${deviceId}", detail.module_name)
@@ -487,12 +487,12 @@ def poll() {
     log.debug "State: ${state.deviceState}"
 
 	settings.devices.each { deviceId ->
-		def detail = state.deviceDetail[deviceId]
-		def data = state.deviceState[deviceId]
-		def child = children.find { it.deviceNetworkId == deviceId }
+		def detail = state?.deviceDetail[deviceId]
+		def data = state?.deviceState[deviceId]
+		def child = children?.find { it.deviceNetworkId == deviceId }
 
 		log.debug "Update: $child";
-		switch(detail.type) {
+		switch(detail?.type) {
 			case 'NAMain':
 				log.debug "Updating NAMain $data"
 				child?.sendEvent(name: 'temperature', value: cToPref(data['Temperature']) as float, unit: getTemperatureScale())

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

@@ -39,6 +39,7 @@ preferences {
 	page(name: "completionPage")
 	page(name: "numbersPage")
 	page(name: "controllerExplanationPage")
+	page(name: "unsupportedDevicesPage")
 }
 
 def rootPage() {
@@ -47,6 +48,9 @@ def rootPage() {
 		section("What to dim") {
 			input(name: "dimmers", type: "capability.switchLevel", title: "Dimmers", description: null, multiple: true, required: true, submitOnChange: true)
 			if (dimmers) {
+				if (dimmersContainUnsupportedDevices()) {
+					href(name: "toUnsupportedDevicesPage", page: "unsupportedDevicesPage", title: "Some of your selected dimmers don't seem to be supported", description: "Tap here to fix it", required: true)
+				}
 				href(name: "toNumbersPage", page: "numbersPage", title: "Duration & Direction", description: numbersPageHrefDescription(), state: "complete")
 			}
 		}
@@ -71,6 +75,31 @@ def rootPage() {
 	}
 }
 
+def unsupportedDevicesPage() {
+
+	def unsupportedDimmers = dimmers.findAll { !hasSetLevelCommand(it) }
+
+	dynamicPage(name: "unsupportedDevicesPage") {
+		if (unsupportedDimmers) {
+			section("These devices do not support the setLevel command") {
+				unsupportedDimmers.each {
+					paragraph deviceLabel(it)
+				}
+			}
+			section {
+				input(name: "dimmers", type: "capability.sensor", title: "Please remove the above devices from this list.", submitOnChange: true, multiple: true)
+			}
+			section {
+				paragraph "If you think there is a mistake here, please contact support."
+			}
+		} else {
+			section {
+				paragraph "You're all set. You can hit the back button, now. Thanks for cleaning up your settings :)"
+			}
+		}
+	}
+}
+
 def controllerExplanationPage() {
 	dynamicPage(name: "controllerExplanationPage", title: "How To Control Gentle Wake Up") {
 
@@ -528,14 +557,16 @@ def updateDimmers(percentComplete) {
 		} else {
 
 			def shouldChangeColors = (colorize && colorize != "false")
-			def canChangeColors = hasSetColorCommand(dimmer)
 
-			log.debug "Setting ${deviceLabel(dimmer)} to ${nextLevel}"
-
-			if (shouldChangeColors && canChangeColors) {
-				dimmer.setColor([hue: getHue(dimmer, nextLevel), saturation: 100, level: nextLevel])
-			} else {
+			if (shouldChangeColors && hasSetColorCommand(dimmer)) {
+				def hue = getHue(dimmer, nextLevel)
+				log.debug "Setting ${deviceLabel(dimmer)} level to ${nextLevel} and hue to ${hue}"
+				dimmer.setColor([hue: hue, saturation: 100, level: nextLevel])
+			} else if (hasSetLevelCommand(dimmer)) {
+				log.debug "Setting ${deviceLabel(dimmer)} level to ${nextLevel}"
 				dimmer.setLevel(nextLevel)
+			} else {
+				log.warn "${deviceLabel(dimmer)} does not have setColor or setLevel commands."
 			}
 
 		}
@@ -817,24 +848,21 @@ private getRedHue(level) {
 	if (level >= 96) return 17
 }
 
+private dimmersContainUnsupportedDevices() {
+	def found = dimmers.find { hasSetLevelCommand(it) == false }
+	return found != null
+}
+
 private hasSetLevelCommand(device) {
-	def isDimmer = false
-	device.supportedCommands.each {
-		if (it.name.contains("setLevel")) {
-			isDimmer = true
-		}
-	}
-	return isDimmer
+	return hasCommand(device, "setLevel")
 }
 
 private hasSetColorCommand(device) {
-	def hasColor = false
-	device.supportedCommands.each {
-		if (it.name.contains("setColor")) {
-			hasColor = true
-		}
-	}
-	return hasColor
+	return hasCommand(device, "setColor")
+}
+
+private hasCommand(device, String command) {
+	return (device.supportedCommands.find { it.name == command } != null)
 }
 
 private dimmersWithSetColorCommand() {
@@ -1073,4 +1101,4 @@ def hasStartLevel() {
 
 def hasEndLevel() {
 	return (endLevel != null && endLevel != "")
-}
+}

smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy

@@ -658,29 +658,73 @@ def updateDevice() {
 	def data = request.JSON
 	def command = data.command
 	def arguments = data.arguments
-
 	log.debug "updateDevice, params: ${params}, request: ${data}"
 	if (!command) {
 		render status: 400, data: '{"msg": "command is required"}'
 	} else {
 		def device = allDevices.find { it.id == params.id }
-		if (device) {
-        	if (device.hasCommand("$command")) {
-                if (arguments) {
-                    device."$command"(*arguments)
-                } else {
-                    device."$command"()
-                }
-                render status: 204, data: "{}"
-           	} else {
-				render status: 404, data: '{"msg": "Command not supported by this Device"}'
-			}
-		} else {
-			render status: 404, data: '{"msg": "Device not found"}'
-		}
+    if (device) {
+        if (validateCommand(device, command)) {
+            if (arguments) {
+                device."$command"(*arguments)
+            } else {
+                device."$command"()
+            }
+            render status: 204, data: "{}"
+        } else {
+          render status: 403, data: '{"msg": "Access denied. This command is not supported by current capability."}'
+        }
+    } else {
+      render status: 404, data: '{"msg": "Device not found"}'
+    }
+  }
+}
+
+/**
+ * Validating the command passed by the user based on capability.
+ * @return boolean
+ */
+def validateCommand(device, command) {
+	def capabilityCommands = getDeviceCapabilityCommands(device.capabilities)
+	def currentDeviceCapability = getCapabilityName(device)
+	if (currentDeviceCapability != "" && capabilityCommands[currentDeviceCapability]) {
+    return (command in capabilityCommands[currentDeviceCapability] || (currentDeviceCapability == "Switch" && command == "setLevel" && device.hasCommand("setLevel"))) ? true : false
+	} else {
+		// Handling other device types here, which don't accept commands
+		httpError(400, "Bad request.")
 	}
 }
 
+/**
+ * Need to get the attribute name to do the lookup. Only
+ * doing it for the device types which accept commands
+ * @return attribute name of the device type
+ */
+def getCapabilityName(device) {
+    def capName = ""
+    if (switches.find{it.id == device.id})
+			capName = "Switch"
+		else if (alarms.find{it.id == device.id})
+			capName = "Alarm"
+		else if (locks.find{it.id == device.id})
+			capName = "Lock"
+    log.trace "Device: $device - Capability Name: $capName"
+		return capName
+}
+
+/**
+ * Constructing the map over here of
+ * supported commands by device capability
+ * @return a map of device capability -> supported commands
+ */
+def getDeviceCapabilityCommands(deviceCapabilities) {
+	def map = [:]
+	deviceCapabilities.collect {
+		map[it.name] = it.commands.collect{ it.name.toString() }
+	}
+	return map
+}
+
 def listSubscriptions() {
 	log.debug "listSubscriptions()"
 	app.subscriptions?.findAll { it.device?.device && it.device.id }?.collect {
@@ -779,18 +823,33 @@ def deviceHandler(evt) {
 }
 
 def sendToHarmony(evt, String callbackUrl) {
-	def callback = new URI(callbackUrl)
-	def host = callback.port != -1 ? "${callback.host}:${callback.port}" : callback.host
-	def path = callback.query ? "${callback.path}?${callback.query}".toString() : callback.path
-	sendHubCommand(new physicalgraph.device.HubAction(
-		method: "POST",
-		path: path,
-		headers: [
-			"Host": host,
-			"Content-Type": "application/json"
-		],
-		body: [evt: [deviceId: evt.deviceId, name: evt.name, value: evt.value]]
-	))
+  def callback = new URI(callbackUrl)
+  if (callback.port != -1) {
+  	def host = callback.port != -1 ? "${callback.host}:${callback.port}" : callback.host
+  	def path = callback.query ? "${callback.path}?${callback.query}".toString() : callback.path
+  	sendHubCommand(new physicalgraph.device.HubAction(
+  		method: "POST",
+  		path: path,
+  		headers: [
+  			"Host": host,
+  			"Content-Type": "application/json"
+  		],
+  		body: [evt: [deviceId: evt.deviceId, name: evt.name, value: evt.value]]
+  	))
+  } else {
+    def params = [
+      uri: callbackUrl,
+      body: [evt: [deviceId: evt.deviceId, name: evt.name, value: evt.value]]
+    ]
+    try {
+        log.debug "Sending data to Harmony Cloud: $params"
+        httpPostJson(params) { resp ->
+            log.debug "Harmony Cloud - Response: ${resp.status}"
+        }
+    } catch (e) {
+        log.error "Harmony Cloud - Something went wrong: $e"
+    }
+  }
 }
 
 def listHubs() {

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

@@ -0,0 +1,798 @@
+/**
+ *  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
+}

smartapps/vlaminck/alfred-workflow.src/alfred-workflow.groovy

@@ -92,22 +92,87 @@ void updateLock() {
 
 private void updateAll(devices) {
 	def command = request.JSON?.command
-	if (command) {
-		devices."$command"()
+	def type = params.param1
+	if (!devices) {
+		httpError(404, "Devices not found")
+	}
+	
+	if (command){
+		devices.each { device ->
+			executeCommand(device, type, command)
+		}
 	}
 }
 
 private void update(devices) {
 	log.debug "update, request: ${request.JSON}, params: ${params}, devices: $devices.id"
 	def command = request.JSON?.command
-	if (command) {
-		def device = devices.find { it.id == params.id }
-		if (!device) {
-			httpError(404, "Device not found")
-		} else {
-			device."$command"()
-		}
+	def type = params.param1
+	def device = devices?.find { it.id == params.id }
+
+	if (!device) {
+		httpError(404, "Device not found")
 	}
+
+	if (command) {
+		executeCommand(device, type, command)
+	}
+}
+
+/**
+ * Validating the command passed by the user based on capability.
+ * @return boolean
+ */
+def validateCommand(device, deviceType, command) {
+	def capabilityCommands = getDeviceCapabilityCommands(device.capabilities)
+	def currentDeviceCapability = getCapabilityName(deviceType)
+	if (capabilityCommands[currentDeviceCapability]) {
+		return command in capabilityCommands[currentDeviceCapability] ? true : false
+	} else {
+		// Handling other device types here, which don't accept commands
+		httpError(400, "Bad request.")
+	}
+}
+
+/**
+ * Need to get the attribute name to do the lookup. Only
+ * doing it for the device types which accept commands
+ * @return attribute name of the device type
+ */
+def getCapabilityName(type) {
+    switch(type) {
+		case "switches":
+			return "Switch"
+		case "locks":
+			return "Lock"
+		default:
+			return type
+	}
+}
+
+/**
+ * Constructing the map over here of
+ * supported commands by device capability
+ * @return a map of device capability -> supported commands
+ */
+def getDeviceCapabilityCommands(deviceCapabilities) {
+	def map = [:]
+	deviceCapabilities.collect {
+		map[it.name] = it.commands.collect{ it.name.toString() }
+	}
+	return map
+}
+
+/**
+ * Validates and executes the command
+ * on the device or devices
+ */
+def executeCommand(device, type, command) {
+	if (validateCommand(device, type, command)) {
+		device."$command"()
+	} else {
+		httpError(403, "Access denied. This command is not supported by current capability.")
+	}	
 }
 
 private show(devices, name) {