Z-Wave Plus Window Shade DVCSMP-1803

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

@@ -29,7 +29,6 @@ metadata {
 		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,0x98,0x86,0x72,0x5A,0x85,0x59,0x73,0x80,0x71,0x31,0x70,0x84,0x7A" // Vision Motion
 	}
 
 	// simulator metadata
@@ -264,9 +263,5 @@ def retypeBasedOnMSR() {
 			log.debug "Changing device type to Door / Window Sensor Plus (SG)"
 			setDeviceType("Door / Window Sensor Plus (SG)")
 			break
-		case "0109-2002-0205": // Vision Motion
-			log.debug "Changing device type to Vision Motion Sensor Plus (SG)"
-			setDeviceType("Vision Motion Sensor Plus (SG)")
-			break
 	}
 }

devicetypes/smartthings/zwave-plus-window-shade.src/zwave-plus-window-shade.groovy

@@ -0,0 +1,244 @@
+/**
+ *  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:
+ *
+ *      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 Plus Window Shade", namespace: "smartthings", author: "SmartThings") {
+		capability "Window Shade"
+		capability "Battery"
+		capability "Refresh"
+		capability "Health Check"
+		capability "Actuator"
+		capability "Sensor"
+
+		command "stop"
+
+		capability "Switch Level"   // until we get a Window Shade Level capability
+		capability "Switch"  // temporary for use with Routines
+
+		// This device handler is specifically for position-aware window coverings
+		//
+		fingerprint type: "0x1107", cc: "0x5E,0x26", deviceJoinName: "Window Shade"
+		fingerprint type: "0x9A00", cc: "0x5E,0x26", deviceJoinName: "Window Shade"
+		fingerprint mfr:"026E", prod:"4353", model:"5A31", deviceJoinName: "Window Blinds"
+		fingerprint mfr:"026E", prod:"5253", model:"5A31", deviceJoinName: "Roller Shade"
+	}
+
+	simulator {
+		status "open":  "command: 2603, payload: FF"
+		status "closed": "command: 2603, payload: 00"
+		status "10%": "command: 2603, payload: 0A"
+		status "66%": "command: 2603, payload: 42"
+		status "99%": "command: 2603, payload: 63"
+		status "battery 100%": "command: 8003, payload: 64"
+		status "battery low": "command: 8003, payload: FF"
+
+		// reply messages
+		reply "2001FF,delay 1000,2602": "command: 2603, payload: 10 FF FE"
+		reply "200100,delay 1000,2602": "command: 2603, payload: 60 00 FE"
+		reply "200142,delay 1000,2602": "command: 2603, payload: 10 42 FE"
+		reply "200163,delay 1000,2602": "command: 2603, payload: 10 63 FE"
+	}
+
+	tiles(scale: 2) {
+		multiAttributeTile(name:"windowShade", type: "lighting", width: 6, height: 4, canChangeIcon: true){
+			tileAttribute ("device.windowShade", key: "PRIMARY_CONTROL") {
+				attributeState "open", label:'${name}', action:"close", icon:"st.doors.garage.garage-open", backgroundColor:"#79b821", nextState:"closing"
+				attributeState "closed", label:'${name}', action:"open", icon:"st.doors.garage.garage-closed", backgroundColor:"#ffffff", nextState:"opening"
+				attributeState "partiallyOpen", label:'Open', action:"close", icon:"st.doors.garage.garage-open", backgroundColor:"#79b821", nextState:"closing"
+				attributeState "opening", label:'${name}', action:"stop", icon:"st.doors.garage.garage-opening", backgroundColor:"#79b821", nextState:"partiallyOpen"
+				attributeState "closing", label:'${name}', action:"stop", icon:"st.doors.garage.garage-closing", backgroundColor:"#ffffff", nextState:"partiallyOpen"
+			}
+			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+				attributeState "level", action:"setLevel"
+			}
+		}
+
+		standardTile("refresh", "device.refresh", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh", nextState: "disabled"
+			state "disabled", label:'', action:"", icon:"st.secondary.refresh"
+		}
+
+		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
+			state "battery", label:'${currentValue}% battery', unit:""
+		}
+
+		preferences {
+			input "preset", "number", title: "Default half-open position (1-100)", defaultValue: 50, required: false, displayDuringSetup: false
+		}
+
+		main(["windowShade"])
+		details(["windowShade", "refresh", "battery"])
+
+	}
+}
+
+def parse(String description) {
+	def result = null
+	//if (description =~ /command: 2603, payload: ([0-9A-Fa-f]{6})/)
+	// TODO: Workaround manual parsing of v4 multilevel report
+	def cmd = zwave.parse(description, [0x20: 1, 0x26: 3])  // TODO: switch to SwitchMultilevel v4 and use target value
+	if (cmd) {
+		result = zwaveEvent(cmd)
+	}
+	log.debug "Parsed '$description' to ${result.inspect()}"
+	return result
+}
+
+def getCheckInterval() {
+	// These are battery-powered devices, and it's not very critical
+	// to know whether they're online or not – 12 hrs
+	12 * 60 * 60
+}
+
+def installed() {
+	sendEvent(name: "checkInterval", value: checkInterval, displayed: false)
+}
+
+def updated() {
+	if (device.latestValue("checkInterval") != checkInterval) {
+		sendEvent(name: "checkInterval", value: checkInterval, displayed: false)
+	}
+	if (!device.latestState("battery")) {
+		response(zwave.batteryV1.batteryGet())
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
+	handleLevelReport(cmd)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
+	handleLevelReport(cmd)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv3.SwitchMultilevelReport cmd) {
+	handleLevelReport(cmd)
+}
+
+private handleLevelReport(physicalgraph.zwave.Command cmd) {
+	def descriptionText = null
+	def shadeValue = null
+
+	def level = cmd.value as Integer
+	if (level >= 99) {
+		level = 99
+		shadeValue = "open"
+	} else if (level <= 0) {
+		level = 0  // unlike dimmer switches, the level isn't saved when closed
+		shadeValue = "closed"
+	} else {
+		shadeValue = "partiallyOpen"
+		descriptionText = "${device.displayName} shade is ${level}% open"
+	}
+	def levelEvent = createEvent(name: "level", value: level, unit: "%", displayed: false)
+	def stateEvent = createEvent(name: "windowShade", value: shadeValue, descriptionText: descriptionText, isStateChange: levelEvent.isStateChange)
+
+	def result = [stateEvent, levelEvent]
+	if (!state.lastbatt || now() - state.lastbatt > 24 * 60 * 60 * 1000) {
+		log.debug "requesting battery"
+		state.lastbatt = (now() - 23 * 60 * 60 * 1000) // don't queue up multiple battery reqs in a row
+		result << response(["delay 15000", zwave.batteryV1.batteryGet().format()])
+	}
+	result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv3.SwitchMultilevelStopLevelChange cmd) {
+	[ createEvent(name: "windowShade", value: "partiallyOpen", displayed: false, descriptionText: "$device.displayName shade stopped"),
+	  response(zwave.switchMultilevelV1.switchMultilevelGet().format()) ]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
+	updateDataValue("MSR", msr)
+	if (cmd.manufacturerName) {
+		updateDataValue("manufacturer", cmd.manufacturerName)
+	}
+	createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
+}
+
+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
+	}
+	state.lastbatt = now()
+	createEvent(map)
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	log.debug "unhandled $cmd"
+	return []
+}
+
+def open() {
+	log.debug "open()"
+	/*delayBetween([
+			zwave.basicV1.basicSet(value: 0xFF).format(),
+			zwave.switchMultilevelV1.switchMultilevelGet().format()
+	], 1000)*/
+	zwave.basicV1.basicSet(value: 0xFF).format()
+}
+
+def close() {
+	log.debug "close()"
+	/*delayBetween([
+			zwave.basicV1.basicSet(value: 0x00).format(),
+			zwave.switchMultilevelV1.switchMultilevelGet().format()
+	], 1000)*/
+	zwave.basicV1.basicSet(value: 0).format()
+}
+
+def on() {
+	open()
+}
+
+def off() {
+	close()
+}
+
+def setLevel(value, duration = null) {
+	log.debug "setLevel(${value.inspect()})"
+	Integer level = value as Integer
+	if (level < 0) level = 0
+	if (level > 99) level = 99
+	if (!preset && level > 0 && level < 95) state.preset = level
+	delayBetween([
+			zwave.basicV1.basicSet(value: level).format(),
+			zwave.switchMultilevelV1.switchMultilevelGet().format()
+	])
+}
+
+def presetPosition() {
+	setLevel(preset ?: state.preset ?: 50)
+}
+
+def stop() {
+	log.debug "stop()"
+	zwave.switchMultilevelV3.switchMultilevelStopLevelChange().format()
+}
+
+def ping() {
+	zwave.switchMultilevelV1.switchMultilevelGet().format()
+}
+
+def refresh() {
+	log.debug "refresh()"
+	delayBetween([
+			zwave.switchMultilevelV1.switchMultilevelGet().format(),
+			zwave.batteryV1.batteryGet().format()
+	], 1500)
+}

smartapps/cloudcar/cloudcar.src/cloudcar.groovy

@@ -1,333 +0,0 @@
-/**
- *  CCTest
- *
- *  Copyright 2016 Kuldip
- *
- *  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: "CloudCar",
-    namespace: "CloudCar",
-    author: "Kuldip@CloudCar",
-    description: "Connect Car and Home",
-    category: "Convenience",
-    iconUrl: "http://justdrive.net/wp-content/themes/justdrive/assets/img/jd-logo-sans.png",
-    iconX2Url: "http://justdrive.net/wp-content/themes/justdrive/assets/img/jd-logo-sans.png",
-    iconX3Url: "http://justdrive.net/wp-content/themes/justdrive/assets/img/jd-logo-sans.png",
-    oauth: [displayName: "CloudCar", displayLink: "https://CloudCar.com"]
-)
-
-preferences {
-    section ("Control your home while driving your car") {
-                input "switches", "capability.switch", title: "Which Switches?", multiple: true, required: false
-                input "motionSensors", "capability.motionSensor", title: "Which Motion Sensors?", multiple: true, required: false
-                input "contactSensors", "capability.contactSensor", title: "Which Contact Sensors?", multiple: true, required: false
-                input "presenceSensors", "capability.presenceSensor", title: "Which Presence Sensors?", multiple: true, required: false
-                input "temperatureSensors", "capability.temperatureMeasurement", title: "Which Temperature Sensors?", multiple: true, required: false
-                input "accelerationSensors", "capability.accelerationSensor", title: "Which Vibration Sensors?", multiple: true, required: false
-                input "waterSensors", "capability.waterSensor", title: "Which Water Sensors?", multiple: true, required: false
-                input "lightSensors", "capability.illuminanceMeasurement", title: "Which Light Sensors?", multiple: true, required: false
-                input "humiditySensors", "capability.relativeHumidityMeasurement", title: "Which Relative Humidity Sensors?", multiple: true, required: false
-                input "alarms", "capability.alarm", title: "Which Sirens?", multiple: true, required: false
-                input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false
-    }
-}
-
-mappings {
-    path("/scan") {
-        action: [
-            GET: "scanDevices"
-        ]
-    }
-    path("/control/:command") {
-        action: [
-            GET: "updateSwitches"
-        ]
-    }
-    path("/control/:deviceType/:deviceId/:command") {
-        action: [
-            GET: "updateDevice"
-        ]
-    }
-}
-
-def installed() {
-    log.debug "[installed]: state ${state}"
-    initialize ()
-}
-
-def uninstalled() {
-        log.debug "[uninstalled]: ${settings}"
-}
-
-def updated () {
-	log.debug "[updated]: ${settings}"
-    unsubscribe()
-    initialize ()
-}
-
-def initialize () {
-    state.clear() // clear previous state - state is loaded from persistant store
-    addSubscription()
-}
- 
-def addSubscription() {
-	def callbackUrl = 'http://ec2-54-67-21-37.us-west-1.compute.amazonaws.com/notify' //data.callbackUrl
-    log.debug "[addSubscription]  state ${state}"
-    log.debug "[addSubscription]  settings ${settings}"
-	settings.each {
-		log.debug "[addSubscription]  settings ${it}"
-    }
-    
-    def currentDeviceIds = settings.collect { k, devices -> devices }.flatten().collect()// { it.id }.unique()
-    log.debug "[addSubscription]  currentDeviceIds  ${currentDeviceIds}"
-	currentDeviceIds.each {
-        log.debug "[addSubscription]  device ids ${it} - ${it.id}"
-        log.debug "Adding switch subscription " + callbackUrl
-		state[it.id] = [callbackUrl: callbackUrl]
-    }
-	subscribe(switches, "switch.on", mydeviceHandler)
-	subscribe(contactSensors, "contact.open", mydeviceHandler)
-    subscribe(motionSensors, "motion.active", mydeviceHandler)
-	log.debug "[addSubscription] COMPLETED ${state}"
-}
-
-def mydeviceHandler(evt) {
-	def callbackUrl = 'http://ec2-54-67-21-37.us-west-1.compute.amazonaws.com/notify' //data.callbackUrl
-	//def callbackUrl = 'https://testing.justdrive.cloudcar.com/notify/5c5dca5f-1b98-fff9-f111-8072b41c5fb3'
-	log.debug "[deviceHandler] $evt.displayName"
-	def deviceInfo = state[evt.deviceId]
-    log.debug "[deviceHandler] deviceInfo ${deviceInfo}"
-	if (deviceInfo) {
-		try {
-				httpPostJson(uri: callbackUrl, path: '',  body: [deviceId: evt.deviceId, deviceType: evt.name, deviceName: evt.displayName, value: evt.value]) {   
-				log.debug "[deviceHandler] Event data successfully posted"
-			}
-		} catch (groovyx.net.http.ResponseParseException e) {
-			log.debug("Error parsing payload ${e}")
-		}
-	} else {
-		log.debug "[deviceHandler] No subscribed device found"
-	}
-}
-
-
-def scanDevices() {
-        log.debug "[scandevices] ${type}"
-        [
-        switches: switches.collect{KPdevice(it,"switches")},
-        contactSensors: contacts.collect{KPdevice(it,"contactSensors")},
-        temperatures: temperatures.collect{KPdevice(it,"temperature")},
-        ]
-}
-
-private KPdevice(it, type) {
-	def device_state = null
-    log.debug "KPDevice it: ${it}"
-	if (it.currentValue("switch") == "on" ) {
-        device_state = [label:it.label, type:type, id:it.id]
-			for (attribute in it.supportedAttributes) {
-				device_state."${attribute}" = it.currentValue("${attribute}")
-			}
-		}
-		log.debug "KPdevice: ${device_state}"
-		device_state ? device_state : null
-}
-
-def void updateSwitches() {
-	// use the built-in request object to get the command parameter
-	def command = params.command
-	log.debug "updateSwitches: ${params.command}"
-    // all switches have the command
-    // execute the command on all switches
-    // (note we can do this on the array - the command will be invoked on every element
-
-    switch(command) {
-        case "on":
-            switches.on()
-            break
-        case "off":
-            switches.off()
-            break
-        default:
-            httpError(400, "$command is not a valid command for all switches specified")
-    }
-}
-
-def void updateDevice() {
-	// use the built-in request object to get the command parameter
-	def command = params.command
-    def deviceId = params.deviceId
-    def devices = settings[params.deviceType]
-
-    log.debug "[updateDevice] ${deviceId} - ${command} - ${devices}"
-    
-    // all switches have the command
-    // execute the command on all switches
-    // (note we can do this on the array - the command will be invoked on every element
-	def device = devices.find { it.id == deviceId }
-	if (!device) {
-		httpError(404, "Device not found")
-	} else {
-		device."$command"()
-	}
-}
-
-def list() {
-        log.debug "[PROD] list, params: ${params}"
-        def type = params.deviceType
-        settings[type]?.collect{deviceItem(it)} ?: []
-}
-
-def listStates() {
-        log.debug "[PROD] liststates, params: ${params}"
-        def type = params.deviceType
-        def attributeName = attributeFor(type)
-        settings[type]?.collect{deviceState(it, it.currentState(attributeName))} ?: []
-}
-
-def listSubscriptions() {
-        log.debug "[PROD] listSubscription, params: ${params}"
-        state
-}
-
-def update() {
-        def type = params.deviceType
-        def data = request.JSON
-        def devices = settings[type]
-        def device = settings[type]?.find { it.id == params.id }
-        def command = data.command
-
-        log.debug "[PROD] update, params: ${params}, request: ${data}, devices: ${devices*.id}"
-
-        if (!device) {
-                httpError(404, "Device not found")
-        }
-
-        if (validateCommand(device, type, command)) {
-                device."$command"()
-        } else {
-                httpError(403, "Access denied. This command is not supported by current capability.")
-        }
-}
-
-/**
- * Validating the command passed by the user based on capability.
-
- * @return boolean
- */
-def validateCommand(device, deviceType, command) {
-        log.debug "[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) {
-        log.debug "[getCapabilityName] ${type}"
-    switch(type) {
-                case "switches":
-                        return "Switch"
-                case "alarms":
-                        return "Alarm"
-                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) {
-        log.debug "[getDeviceCapabilities] ${deviceCapabilities}"
-        def map = [:]
-        deviceCapabilities.collect {
-                map[it.name] = it.commands.collect{ it.name.toString() }
-        }
-        return map
-}
-
-def show() {
-        def type = params.deviceType
-        def devices = settings[type]
-        def device = devices.find { it.id == params.id }
-
-        log.debug "[PROD] show, params: ${params}, devices: ${devices*.id}"
-        if (!device) {
-                httpError(404, "Device not found")
-        }
-        else {
-                def attributeName = attributeFor(type)
-                def s = device.currentState(attributeName)
-                deviceState(device, s)
-        }
-}
-
-def removeSubscription() {
-        def type = params.deviceType
-        def devices = settings[type]
-        def deviceId = params.id
-        def device = devices.find { it.id == deviceId }
-
-        log.debug "[PROD] removeSubscription, params: ${params}, request: ${data}, device: ${device}"
-        if (device) {
-                log.debug "Removing $device.displayName subscription"
-                state.remove(device.id)
-                unsubscribe(device)
-        }
-        log.info state
-}
-
-private deviceItem(it) {
-        log.debug "[deviceItem] ${it}"
-        it ? [id: it.id, label: it.displayName] : null
-
-}
-
-private deviceState(device, s) {
-        log.debug "[deviceState] ${device}: ${s}"
-        device && s ? [id: device.id, label: device.displayName, name: s.name, value: s.value, unixTime: s.date.time] : null
-}
-
-private attributeFor(type) {
-        log.debug "[attributeFor] ${type}"
-        switch (type) {
-                case "switches":
-                        log.debug "[PROD] switch type"
-                        return "switch"
-                case "locks":
-                        log.debug "[PROD] lock type"
-                        return "lock"
-                case "alarms":
-                        log.debug "[PROD] alarm type"
-                        return "alarm"
-                case "lightSensors":
-                        log.debug "[PROD] illuminance type"
-                        return "illuminance"
-                default:
-                        log.debug "[PROD] other sensor type"
-                        return "Sensors"
-        }
-}

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,7 +39,6 @@ preferences {
 	page(name: "completionPage")
 	page(name: "numbersPage")
 	page(name: "controllerExplanationPage")
-	page(name: "unsupportedDevicesPage")
 }
 
 def rootPage() {
@@ -48,9 +47,6 @@ 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")
 			}
 		}
@@ -75,31 +71,6 @@ 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") {
 
@@ -557,16 +528,14 @@ def updateDimmers(percentComplete) {
 		} else {
 
 			def shouldChangeColors = (colorize && colorize != "false")
+			def canChangeColors = hasSetColorCommand(dimmer)
 
-			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)
+			log.debug "Setting ${deviceLabel(dimmer)} to ${nextLevel}"
+
+			if (shouldChangeColors && canChangeColors) {
+				dimmer.setColor([hue: getHue(dimmer, nextLevel), saturation: 100, level: nextLevel])
 			} else {
-				log.warn "${deviceLabel(dimmer)} does not have setColor or setLevel commands."
+				dimmer.setLevel(nextLevel)
 			}
 
 		}
@@ -848,21 +817,24 @@ private getRedHue(level) {
 	if (level >= 96) return 17
 }
 
-private dimmersContainUnsupportedDevices() {
-	def found = dimmers.find { hasSetLevelCommand(it) == false }
-	return found != null
-}
-
 private hasSetLevelCommand(device) {
-	return hasCommand(device, "setLevel")
+	def isDimmer = false
+	device.supportedCommands.each {
+		if (it.name.contains("setLevel")) {
+			isDimmer = true
+		}
+	}
+	return isDimmer
 }
 
 private hasSetColorCommand(device) {
-	return hasCommand(device, "setColor")
-}
-
-private hasCommand(device, String command) {
-	return (device.supportedCommands.find { it.name == command } != null)
+	def hasColor = false
+	device.supportedCommands.each {
+		if (it.name.contains("setColor")) {
+			hasColor = true
+		}
+	}
+	return hasColor
 }
 
 private dimmersWithSetColorCommand() {
@@ -1101,4 +1073,4 @@ def hasStartLevel() {
 
 def hasEndLevel() {
 	return (endLevel != null && endLevel != "")
-}
+}

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

@@ -658,73 +658,29 @@ 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 (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] ? true : false
-	} else {
-		// Handling other device types here, which don't accept commands
-		httpError(400, "Bad request.")
+		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"}'
+		}
 	}
 }
 
-/**
- * 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 {
@@ -824,51 +780,17 @@ def deviceHandler(evt) {
 
 def sendToHarmony(evt, String callbackUrl) {
 	def callback = new URI(callbackUrl)
-  if(isIP(callback.host)){
-  	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"
-    }
-  }
-}
-
-public static boolean isIP(String str) {
-    try {
-         String[] parts = str.split("\\.");
-         if (parts.length != 4) return false;
-         for (int i = 0; i < 4; ++i) {
-             int p
-             try {
-               p = Integer.parseInt(parts[i]);
-             } catch (Exception e) {
-               return false;
-             }
-             if (p > 255 || p < 0) return false;
-         }
-         return true;
-    } catch (Exception e) {
-        return false;
-    }
+	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 listHubs() {

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

@@ -92,89 +92,24 @@ void updateLock() {
 
 private void updateAll(devices) {
 	def command = request.JSON?.command
-	def type = params.param1
-	if (!devices) {
-		httpError(404, "Devices not found")
-	}
-	
-	if (command){
-		devices.each { device ->
-			executeCommand(device, type, command)
-		}
+	if (command) {
+		devices."$command"()
 	}
 }
 
 private void update(devices) {
 	log.debug "update, request: ${request.JSON}, params: ${params}, devices: $devices.id"
 	def command = request.JSON?.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)
+		def device = devices.find { it.id == params.id }
+		if (!device) {
+			httpError(404, "Device not found")
+		} else {
+			device."$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) {
 	def device = devices.find { it.id == params.id }
 	if (!device) {