MSA-1339: Adding support for the Sercomm SZ-DWS04 is simply a matter or adding an additional fingerprint to already existing Smartsense Open/Close sensor.

Please consider adding it as either a separate device handler or as an additional fingerprint to existing handler.

devicetypes/mikespry/sercomm-sz-dws04-open-closed-sensor.src/sercomm-sz-dws04-open-closed-sensor.groovy

@@ -0,0 +1,326 @@
+/**
+ *  Sercomm SZ-DWS04 Open/Closed Sensor
+ *
+ *  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: "Sercomm SZ-DWS04 Open/Closed Sensor", namespace: "mikespry", author: "Mike Sprycha") {
+		capability "Battery"
+		capability "Configuration"
+		capability "Contact Sensor"
+		capability "Refresh"
+		capability "Temperature Measurement"
+        
+		command "enrollResponse"
+ 
+        fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "Sercomm Corp.", model: "SZ-DWS04N_SF", deviceJoinName: "Sercomm SZ-DWS04"
+	}
+ 
+	simulator {
+ 
+	}
+
+	preferences {
+		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+	}
+ 
+	tiles(scale: 2) {
+		multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4){
+			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+				attributeState "open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
+				attributeState "closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
+			}
+		}
+
+		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
+			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", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
+			state "battery", label:'${currentValue}% battery', unit:""
+		}
+
+		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+
+		main (["contact", "temperature"])
+		details(["contact","temperature","battery","refresh"])
+	}
+}
+ 
+def parse(String description) {
+	log.debug "description: $description"
+    
+	Map map = [:]
+	if (description?.startsWith('catchall:')) {
+		map = parseCatchAllMessage(description)
+	}
+	else if (description?.startsWith('read attr -')) {
+		map = parseReportAttributeMessage(description)
+	}
+	else if (description?.startsWith('temperature: ')) {
+		map = parseCustomMessage(description)
+	}
+    else if (description?.startsWith('zone status')) {
+    	map = parseIasMessage(description)
+    }
+ 
+	log.debug "Parse returned $map"
+	def result = map ? createEvent(map) : null
+    
+    if (description?.startsWith('enroll request')) {
+    	List cmds = enrollResponse()
+        log.debug "enroll response: ${cmds}"
+        result = cmds?.collect { new physicalgraph.device.HubAction(it) }
+    }
+    return result
+}
+ 
+private Map parseCatchAllMessage(String description) {
+    Map resultMap = [:]
+    def cluster = zigbee.parse(description)
+    if (shouldProcessMessage(cluster)) {
+        switch(cluster.clusterId) {
+            case 0x0001:
+            	resultMap = getBatteryResult(cluster.data.last())
+                break
+
+            case 0x0402:
+                log.debug 'TEMP'
+                // temp is last 2 data values. reverse to swap endian
+                String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+                def value = getTemperature(temp)
+                resultMap = getTemperatureResult(value)
+                break
+        }
+    }
+
+    return resultMap
+}
+
+private boolean shouldProcessMessage(cluster) {
+    // 0x0B is default response indicating message got through
+    // 0x07 is bind message
+    boolean ignoredMessage = cluster.profileId != 0x0104 || 
+        cluster.command == 0x0B ||
+        cluster.command == 0x07 ||
+        (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
+    return !ignoredMessage
+}
+
+private int getHumidity(value) {
+    return Math.round(Double.parseDouble(value))
+}
+ 
+private Map parseReportAttributeMessage(String description) {
+	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+	log.debug "Desc Map: $descMap"
+ 
+	Map resultMap = [:]
+	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
+		def value = getTemperature(descMap.value)
+		resultMap = getTemperatureResult(value)
+	}
+	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
+		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
+	}
+ 
+	return resultMap
+}
+ 
+private Map parseCustomMessage(String description) {
+	Map resultMap = [:]
+	if (description?.startsWith('temperature: ')) {
+		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
+		resultMap = getTemperatureResult(value)
+	}
+	return resultMap
+}
+
+private Map parseIasMessage(String description) {
+    List parsedMsg = description.split(' ')
+    String msgCode = parsedMsg[2]
+    
+    Map resultMap = [:]
+    switch(msgCode) {
+        case '0x0020': // Closed/No Motion/Dry
+        	resultMap = getContactResult('closed')
+            break
+
+        case '0x0021': // Open/Motion/Wet
+        	resultMap = getContactResult('open')
+            break
+
+        case '0x0022': // Tamper Alarm
+            break
+
+        case '0x0023': // Battery Alarm
+            break
+
+        case '0x0024': // Supervision Report
+        	resultMap = getContactResult('closed')
+            break
+
+        case '0x0025': // Restore Report
+        	resultMap = getContactResult('open')
+            break
+
+        case '0x0026': // Trouble/Failure
+            break
+
+        case '0x0028': // Test Mode
+            break
+    }
+    return resultMap
+}
+ 
+def getTemperature(value) {
+	def celsius = Integer.parseInt(value, 16).shortValue() / 100
+	if(getTemperatureScale() == "C"){
+		return celsius
+	} else {
+		return celsiusToFahrenheit(celsius) as Integer
+	}
+}
+
+private Map getBatteryResult(rawValue) {
+	log.debug 'Battery'
+	def linkText = getLinkText(device)
+    
+    def result = [
+    	name: 'battery'
+    ]
+    
+	def volts = rawValue / 10
+	def descriptionText
+    if (rawValue == 0 || rawValue == 255) {}
+    else if (volts > 3.5) {
+		result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
+	}
+	else {
+		def minVolts = 2.1
+    	def maxVolts = 3.0
+		def pct = (volts - minVolts) / (maxVolts - minVolts)
+		result.value = Math.min(100, (int) pct * 100)
+		result.descriptionText = "${linkText} battery was ${result.value}%"
+	}
+
+	return result
+}
+
+private Map getTemperatureResult(value) {
+	log.debug 'TEMP'
+	def linkText = getLinkText(device)
+	if (tempOffset) {
+		def offset = tempOffset as int
+		def v = value as int
+		value = v + offset
+	}
+	def descriptionText = "${linkText} was ${value}°${temperatureScale}"
+	return [
+		name: 'temperature',
+		value: value,
+		descriptionText: descriptionText
+	]
+}
+
+private Map getContactResult(value) {
+	log.debug 'Contact Status'
+	def linkText = getLinkText(device)
+	def descriptionText = "${linkText} was ${value == 'open' ? 'opened' : 'closed'}"
+	return [
+		name: 'contact',
+		value: value,
+		descriptionText: descriptionText
+	]
+}
+
+def refresh() {
+	log.debug "Refreshing Temperature and Battery"
+	def refreshCmds = [
+        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+	]
+
+	return refreshCmds + enrollResponse()
+}
+
+def configure() {
+
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
+	log.debug "Configuring Reporting, IAS CIE, and Bindings."
+	def configCmds = [
+		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
+
+		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 500",
+		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}",		//checkin time 6 hrs
+		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
+
+		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x402 {${device.zigbeeId}} {}", "delay 500",
+		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 500"
+	]
+    return configCmds + refresh() // send refresh cmds as part of config
+}
+
+def enrollResponse() {
+	log.debug "Sending enroll response"
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
+	[
+		//Resending the CIE in case the enroll request is sent before CIE is written
+		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		//Enroll Response
+		"raw 0x500 {01 23 00 00 00}",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+	]
+}
+
+private getEndpointId() {
+	new BigInteger(device.endpointId, 16).toString()
+}
+
+private hex(value) {
+	new BigInteger(Math.round(value).toString()).toString(16)
+}
+
+private String swapEndianHex(String hex) {
+    reverseArray(hex.decodeHex()).encodeHex()
+}
+
+private byte[] reverseArray(byte[] array) {
+    int i = 0;
+    int j = array.length - 1;
+    byte tmp;
+    while (j > i) {
+        tmp = array[j];
+        array[j] = array[i];
+        array[i] = tmp;
+        j--;
+        i++;
+    }
+    return array
+}

devicetypes/smartthings-users/nest.src/nest.groovy

@@ -1,600 +0,0 @@
-/**
- *  Nest Direct
- *
- *  Author: dianoga7@3dgo.net
- *  Code: https://github.com/smartthings-users/device-type.nest
- *
- * INSTALLATION
- * =========================================
- * 1) Create a new device type (https://graph.api.smartthings.com/ide/devices)
- *     Name: Nest
- *     Author: dianoga7@3dgo.net
- *     Capabilities:
- *         Polling
- *         Relative Humidity Measurement
- *         Thermostat
- *         Temperature Measurement
- *         Presence Sensor
- *         Sensor
- *     Custom Attributes:
- *         temperatureUnit
- *     Custom Commands:
- *         away
- *         present
- *         setPresence
- *         heatingSetpointUp
- *         heatingSetpointDown
- *         coolingSetpointUp
- *         coolingSetpointDown
- *         setFahrenheit
- *         setCelsius
- *
- * 2) If you want to switch from slider controls to buttons, comment out the slider details line and uncomment the button details line.
- *
- * 3) Create a new device (https://graph.api.smartthings.com/device/list)
- *     Name: Your Choice
- *     Device Network Id: Your Choice
- *     Type: Nest (should be the last option)
- *     Location: Choose the correct location
- *     Hub/Group: Leave blank
- *
- * 4) Update device preferences
- *     Click on the new device to see the details.
- *     Click the edit button next to Preferences
- *     Fill in your information.
- *     To find your serial number, login to http://home.nest.com. Click on the thermostat
- *     you want to control. Under settings, go to Technical Info. Your serial number is
- *     the second item.
- *
- * 5) That's it, you're done.
- *
- * Copyright (C) 2013 Brian Steere <dianoga7@3dgo.net>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this
- * software and associated documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to the following
- * conditions: The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-preferences {
-	input("username", "text", title: "Username", description: "Your Nest username (usually an email address)")
-	input("password", "password", title: "Password", description: "Your Nest password")
-	input("serial", "text", title: "Serial #", description: "The serial number of your thermostat")
-}
-
-// for the UI
-metadata {
-	definition (name: "Nest", namespace: "smartthings-users", author: "dianoga7@3dgo.net") {
-		capability "Polling"
-		capability "Relative Humidity Measurement"
-		capability "Thermostat"
-		capability "Temperature Measurement"
-		capability "Presence Sensor"
-		capability "Sensor"
-
-		command "away"
-		command "present"
-		command "setPresence"
-		command "heatingSetpointUp"
-		command "heatingSetpointDown"
-		command "coolingSetpointUp"
-		command "coolingSetpointDown"
-		command "setFahrenheit"
-		command "setCelsius"
-
-		attribute "temperatureUnit", "string"
-	}
-
-	simulator {
-		// TODO: define status and reply messages here
-	}
-
-	tiles {
-		valueTile("temperature", "device.temperature", canChangeIcon: true, canChangeBackground:true) {
-			state("temperature", label: '${currentValue}°', backgroundColors: [
-				// Celsius Color Range
-				[value: 0, color: "#153591"],
-				[value: 7, color: "#1e9cbb"],
-				[value: 15, color: "#90d2a7"],
-				[value: 23, color: "#44b621"],
-				[value: 29, color: "#f1d801"],
-				[value: 33, color: "#d04e00"],
-				[value: 36, color: "#bc2323"],
-				// Fahrenheit Color Range
-				[value: 40, color: "#153591"],
-				[value: 44, color: "#1e9cbb"],
-				[value: 59, color: "#90d2a7"],
-				[value: 74, color: "#44b621"],
-				[value: 84, color: "#f1d801"],
-				[value: 92, color: "#d04e00"],
-				[value: 96, color: "#bc2323"]
-			]
-			)
-		}
-
-		standardTile("thermostatMode", "device.thermostatMode", inactiveLabel: true, decoration: "flat") {
-			state("auto", action:"thermostat.off", icon: "st.thermostat.auto")
-			state("off", action:"thermostat.cool", icon: "st.thermostat.heating-cooling-off")
-			state("cool", action:"thermostat.heat", icon: "st.thermostat.cool")
-			state("heat", action:"thermostat.auto", icon: "st.thermostat.heat")
-		}
-
-		standardTile("thermostatFanMode", "device.thermostatFanMode", inactiveLabel: true, decoration: "flat") {
-			state "auto", action:"thermostat.fanOn", icon: "st.thermostat.fan-auto"
-			state "on", action:"thermostat.fanCirculate", icon: "st.thermostat.fan-on"
-			state "circulate", action:"thermostat.fanAuto", icon: "st.thermostat.fan-circulate"
-		}
-
-		valueTile("heatingSetpoint", "device.heatingSetpoint") {
-			state "default", label:'${currentValue}°', unit:"Heat", backgroundColor:"#bc2323"
-		}
-
-		valueTile("coolingSetpoint", "device.coolingSetpoint") {
-			state "default", label:'${currentValue}°', unit:"Cool", backgroundColor:"#1e9cbb"
-		}
-
-		standardTile("thermostatOperatingState", "device.thermostatOperatingState", inactiveLabel: false, decoration: "flat") {
-			state "idle", action:"polling.poll", label:'${name}', icon: "st.sonos.pause-icon"
-			state "cooling", action:"polling.poll", label:'  ', icon: "st.thermostat.cooling", backgroundColor:"#1e9cbb"
-			state "heating", action:"polling.poll", label:'  ', icon: "st.thermostat.heating", backgroundColor:"#bc2323"
-			state "fan only", action:"polling.poll", label:'${name}', icon: "st.Appliances.appliances11"
-		}
-
-		valueTile("humidity", "device.humidity", inactiveLabel: false) {
-			state "default", label:'${currentValue}%', unit:"Humidity"
-		}
-
-		standardTile("presence", "device.presence", inactiveLabel: false, decoration: "flat") {
-			state "present", label:'${name}', action:"away", icon: "st.Home.home2"
-			state "not present", label:'away', action:"present", icon: "st.Transportation.transportation5"
-		}
-
-		standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"polling.poll", icon:"st.secondary.refresh"
-		}
-
-		standardTile("temperatureUnit", "device.temperatureUnit", canChangeIcon: false) {
-			state "fahrenheit",  label: "°F", icon: "st.alarm.temperature.normal", action:"setCelsius"
-			state "celsius", label: "°C", icon: "st.alarm.temperature.normal", action:"setFahrenheit"
-		}
-
-		controlTile("heatSliderControl", "device.heatingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "setHeatingSetpoint", label:'Set temperature to', action:"thermostat.setHeatingSetpoint"
-		}
-		controlTile("coolSliderControl", "device.coolingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "setCoolingSetpoint", label:'Set temperature to', action:"thermostat.setCoolingSetpoint"
-		}
-
-		standardTile("heatingSetpointUp", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-			state "heatingSetpointUp", label:'  ', action:"heatingSetpointUp", icon:"st.thermostat.thermostat-up", backgroundColor:"#bc2323"
-		}
-
-		standardTile("heatingSetpointDown", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-			state "heatingSetpointDown", label:'  ', action:"heatingSetpointDown", icon:"st.thermostat.thermostat-down", backgroundColor:"#bc2323"
-		}
-
-		standardTile("coolingSetpointUp", "device.coolingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-			state "coolingSetpointUp", label:'  ', action:"coolingSetpointUp", icon:"st.thermostat.thermostat-up", backgroundColor:"#1e9cbb"
-		}
-
-		standardTile("coolingSetpointDown", "device.coolingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-			state "coolingSetpointDown", label:'  ', action:"coolingSetpointDown", icon:"st.thermostat.thermostat-down", backgroundColor:"#1e9cbb"
-		}
-
-		main(["temperature", "thermostatOperatingState", "humidity"])
-
-		// ============================================================
-		// Slider or Buttons...
-		// To expose buttons, comment out the first detials line below and uncomment the second details line below.
-		// To expose sliders, uncomment the first details line below and comment out the second details line below.
-
-		details(["temperature", "thermostatOperatingState", "humidity", "thermostatMode", "thermostatFanMode", "presence", "heatingSetpoint", "heatSliderControl", "coolingSetpoint", "coolSliderControl", "temperatureUnit", "refresh"])
-		// details(["temperature", "thermostatOperatingState", "humidity", "thermostatMode", "thermostatFanMode", "presence", "heatingSetpointDown", "heatingSetpoint", "heatingSetpointUp", "coolingSetpointDown", "coolingSetpoint", "coolingSetpointUp", "temperatureUnit", "refresh"])
-
-		// ============================================================
-
-	}
-
-}
-
-// parse events into attributes
-def parse(String description) {
-
-}
-
-// handle commands
-def setHeatingSetpoint(temp) {
-	def latestThermostatMode = device.latestState('thermostatMode')
-	def temperatureUnit = device.latestValue('temperatureUnit')
-
-	switch (temperatureUnit) {
-		case "celsius":
-			if (temp) {
-				if (temp < 9) {
-					temp = 9
-				}
-				if (temp > 32) {
-					temp = 32
-				}
-				if (latestThermostatMode.stringValue == 'auto') {
-					api('temperature', ['target_change_pending': true, 'target_temperature_low': temp]) {
-						sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-					}
-				} else if (latestThermostatMode.stringValue == 'heat') {
-					api('temperature', ['target_change_pending': true, 'target_temperature': temp]) {
-							sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-					}
-				}
-			}
-			break;
-		default:
-			if (temp) {
-				if (temp < 51) {
-					temp = 51
-				}
-				if (temp > 89) {
-					temp = 89
-				}
-				if (latestThermostatMode.stringValue == 'auto') {
-					api('temperature', ['target_change_pending': true, 'target_temperature_low': fToC(temp)]) {
-						sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-					}
-				} else if (latestThermostatMode.stringValue == 'heat') {
-					api('temperature', ['target_change_pending': true, 'target_temperature': fToC(temp)]) {
-						sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-					}
-				}
-			}
-			break;
-	}
-	poll()
-}
-
-def coolingSetpointUp(){
-	int newSetpoint = device.currentValue("coolingSetpoint") + 1
-	log.debug "Setting cool set point up to: ${newSetpoint}"
-	setCoolingSetpoint(newSetpoint)
-}
-
-def coolingSetpointDown(){
-	int newSetpoint = device.currentValue("coolingSetpoint") - 1
-	log.debug "Setting cool set point down to: ${newSetpoint}"
-	setCoolingSetpoint(newSetpoint)
-}
-
-def setCoolingSetpoint(temp) {
-	def latestThermostatMode = device.latestState('thermostatMode')
-	def temperatureUnit = device.latestValue('temperatureUnit')
-
-	switch (temperatureUnit) {
-		case "celsius":
-			if (temp) {
-				if (temp < 9) {
-					temp = 9
-				}
-				if (temp > 32) {
-					temp = 32
-				}
-				if (latestThermostatMode.stringValue == 'auto') {
-					api('temperature', ['target_change_pending': true, 'target_temperature_high': temp]) {
-						sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-					}
-				} else if (latestThermostatMode.stringValue == 'cool') {
-					api('temperature', ['target_change_pending': true, 'target_temperature': temp]) {
-						sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-					}
-				}
-			}
-			break;
-		default:
-			if (temp) {
-				if (temp < 51) {
-					temp = 51
-				}
-				if (temp > 89) {
-					temp = 89
-				}
-				if (latestThermostatMode.stringValue == 'auto') {
-					api('temperature', ['target_change_pending': true, 'target_temperature_high': fToC(temp)]) {
-						sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-					}
-				} else if (latestThermostatMode.stringValue == 'cool') {
-					api('temperature', ['target_change_pending': true, 'target_temperature': fToC(temp)]) {
-						sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-					}
-				}
-			}
-			break;
-	}
-	poll()
-}
-
-def heatingSetpointUp(){
-	int newSetpoint = device.currentValue("heatingSetpoint") + 1
-	log.debug "Setting heat set point up to: ${newSetpoint}"
-	setHeatingSetpoint(newSetpoint)
-}
-
-def heatingSetpointDown(){
-	int newSetpoint = device.currentValue("heatingSetpoint") - 1
-	log.debug "Setting heat set point down to: ${newSetpoint}"
-	setHeatingSetpoint(newSetpoint)
-}
-
-def setFahrenheit() {
-	def temperatureUnit = "fahrenheit"
-	log.debug "Setting temperatureUnit to: ${temperatureUnit}"
-	sendEvent(name: "temperatureUnit",   value: temperatureUnit)
-	poll()
-}
-
-def setCelsius() {
-	def temperatureUnit = "celsius"
-	log.debug "Setting temperatureUnit to: ${temperatureUnit}"
-	sendEvent(name: "temperatureUnit",   value: temperatureUnit)
-	poll()
-}
-
-def off() {
-	setThermostatMode('off')
-}
-
-def heat() {
-	setThermostatMode('heat')
-}
-
-def emergencyHeat() {
-	setThermostatMode('heat')
-}
-
-def cool() {
-	setThermostatMode('cool')
-}
-
-def auto() {
-	setThermostatMode('range')
-}
-
-def setThermostatMode(mode) {
-	mode = mode == 'emergency heat'? 'heat' : mode
-
-	api('thermostat_mode', ['target_change_pending': true, 'target_temperature_type': mode]) {
-		mode = mode == 'range' ? 'auto' : mode
-		sendEvent(name: 'thermostatMode', value: mode)
-		poll()
-	}
-}
-
-def fanOn() {
-	setThermostatFanMode('on')
-}
-
-def fanAuto() {
-	setThermostatFanMode('auto')
-}
-
-def fanCirculate() {
-	setThermostatFanMode('circulate')
-}
-
-def setThermostatFanMode(mode) {
-	def modes = [
-		on: ['fan_mode': 'on'],
-		auto: ['fan_mode': 'auto'],
-		circulate: ['fan_mode': 'duty-cycle', 'fan_duty_cycle': 900]
-	]
-
-	api('fan_mode', modes.getAt(mode)) {
-		sendEvent(name: 'thermostatFanMode', value: mode)
-		poll()
-	}
-}
-
-def away() {
-	setPresence('away')
-	sendEvent(name: 'presence', value: 'not present')
-}
-
-def present() {
-	setPresence('present')
-	sendEvent(name: 'presence', value: 'present')
-}
-
-def setPresence(status) {
-	log.debug "Status: $status"
-	api('presence', ['away': status == 'away', 'away_timestamp': new Date().getTime(), 'away_setter': 0]) {
-		poll()
-	}
-}
-
-def poll() {
-	log.debug "Executing 'poll'"
-	api('status', []) {
-		data.device = it.data.device.getAt(settings.serial)
-		data.shared = it.data.shared.getAt(settings.serial)
-		data.structureId = it.data.link.getAt(settings.serial).structure.tokenize('.')[1]
-		data.structure = it.data.structure.getAt(data.structureId)
-
-		data.device.fan_mode = data.device.fan_mode == 'duty-cycle'? 'circulate' : data.device.fan_mode
-		data.structure.away = data.structure.away ? 'away' : 'present'
-
-		log.debug(data.shared)
-
-		def humidity = data.device.current_humidity
-		def temperatureType = data.shared.target_temperature_type
-		def fanMode = data.device.fan_mode
-		def heatingSetpoint = '--'
-		def coolingSetpoint = '--'
-
-		temperatureType = temperatureType == 'range' ? 'auto' : temperatureType
-
-		sendEvent(name: 'humidity', value: humidity)
-		sendEvent(name: 'thermostatFanMode', value: fanMode)
-		sendEvent(name: 'thermostatMode', value: temperatureType)
-
-		def temperatureUnit = device.latestValue('temperatureUnit')
-
-		switch (temperatureUnit) {
-			case "celsius":
-				def temperature = Math.round(data.shared.current_temperature)
-				def targetTemperature = Math.round(data.shared.target_temperature)
-
-				if (temperatureType == "cool") {
-					coolingSetpoint = targetTemperature
-				} else if (temperatureType == "heat") {
-					heatingSetpoint = targetTemperature
-				} else if (temperatureType == "auto") {
-					coolingSetpoint = Math.round(data.shared.target_temperature_high)
-					heatingSetpoint = Math.round(data.shared.target_temperature_low)
-				}
-
-				sendEvent(name: 'temperature', value: temperature, unit: temperatureUnit, state: temperatureType)
-				sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-				sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-				break;
-			default:
-				def temperature = Math.round(cToF(data.shared.current_temperature))
-				def targetTemperature = Math.round(cToF(data.shared.target_temperature))
-
-				if (temperatureType == "cool") {
-					coolingSetpoint = targetTemperature
-				} else if (temperatureType == "heat") {
-					heatingSetpoint = targetTemperature
-				} else if (temperatureType == "auto") {
-					coolingSetpoint = Math.round(cToF(data.shared.target_temperature_high))
-					heatingSetpoint = Math.round(cToF(data.shared.target_temperature_low))
-				}
-
-				sendEvent(name: 'temperature', value: temperature, unit: temperatureUnit, state: temperatureType)
-				sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-				sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-				break;
-			}
-
-		switch (device.latestValue('presence')) {
-			case "present":
-				if (data.structure.away == 'away') {
-					sendEvent(name: 'presence', value: 'not present')
-				}
-				break;
-			case "not present":
-				if (data.structure.away == 'present') {
-					sendEvent(name: 'presence', value: 'present')
-				}
-				break;
-		}
-
-		if (data.shared.hvac_ac_state) {
-			sendEvent(name: 'thermostatOperatingState', value: "cooling")
-		} else if (data.shared.hvac_heater_state) {
-			sendEvent(name: 'thermostatOperatingState', value: "heating")
-		} else if (data.shared.hvac_fan_state) {
-			sendEvent(name: 'thermostatOperatingState', value: "fan only")
-		} else {
-			sendEvent(name: 'thermostatOperatingState', value: "idle")
-		}
-	}
-}
-
-def api(method, args = [], success = {}) {
-	if(!isLoggedIn()) {
-		log.debug "Need to login"
-		login(method, args, success)
-		return
-	}
-
-	def methods = [
-		'status': [uri: "/v2/mobile/${data.auth.user}", type: 'get'],
-		'fan_mode': [uri: "/v2/put/device.${settings.serial}", type: 'post'],
-		'thermostat_mode': [uri: "/v2/put/shared.${settings.serial}", type: 'post'],
-		'temperature': [uri: "/v2/put/shared.${settings.serial}", type: 'post'],
-		'presence': [uri: "/v2/put/structure.${data.structureId}", type: 'post']
-	]
-
-	def request = methods.getAt(method)
-
-	log.debug "Logged in"
-	doRequest(request.uri, args, request.type, success)
-}
-
-// Need to be logged in before this is called. So don't call this. Call api.
-def doRequest(uri, args, type, success) {
-	log.debug "Calling $type : $uri : $args"
-
-	if(uri.charAt(0) == '/') {
-		uri = "${data.auth.urls.transport_url}${uri}"
-	}
-
-	def params = [
-		uri: uri,
-		headers: [
-			'X-nl-protocol-version': 1,
-			'X-nl-user-id': data.auth.userid,
-			'Authorization': "Basic ${data.auth.access_token}"
-		],
-		body: args
-	]
-
-	def postRequest = { response ->
-		if (response.getStatus() == 302) {
-			def locations = response.getHeaders("Location")
-			def location = locations[0].getValue()
-			log.debug "redirecting to ${location}"
-			doRequest(location, args, type, success)
-		} else {
-			success.call(response)
-		}
-	}
-
-	try {
-		if (type == 'post') {
-			httpPostJson(params, postRequest)
-		} else if (type == 'get') {
-			httpGet(params, postRequest)
-		}
-	} catch (Throwable e) {
-		login()
-	}
-}
-
-def login(method = null, args = [], success = {}) {
-	def params = [
-		uri: 'https://home.nest.com/user/login',
-		body: [username: settings.username, password: settings.password]
-	]
-
-	httpPost(params) {response ->
-		data.auth = response.data
-		data.auth.expires_in = Date.parse('EEE, dd-MMM-yyyy HH:mm:ss z', response.data.expires_in).getTime()
-		log.debug data.auth
-
-		api(method, args, success)
-	}
-}
-
-def isLoggedIn() {
-	if(!data.auth) {
-		log.debug "No data.auth"
-		return false
-	}
-
-	def now = new Date().getTime();
-	return data.auth.expires_in > now
-}
-
-def cToF(temp) {
-	return (temp * 1.8 + 32).toDouble()
-}
-
-def fToC(temp) {
-	return ((temp - 32) / 1.8).toDouble()
-}

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

@@ -403,21 +403,39 @@ def refresh() {
 
 	if (device.getDataValue("manufacturer") == "SmartThings") {
 		log.debug "Refreshing Values for manufacturer: SmartThings "
-		/* These values of Motion Threshold Multiplier(0x01) and Motion Threshold (0x0276)
-            seem to be giving pretty accurate results for the XYZ co-ordinates for this manufacturer.
-            Separating these out in a separate if-else because I do not want to touch Centralite part
-            as of now.
-        */
-		refreshCmds += zigbee.writeAttribute(0xFC02, 0x0000, 0x20, 0x01, [mfgCode: manufacturerCode])
-		refreshCmds += zigbee.writeAttribute(0xFC02, 0x0002, 0x21, 0x0276, [mfgCode: manufacturerCode])
+		refreshCmds = refreshCmds + [
+			/* These values of Motion Threshold Multiplier(01) and Motion Threshold (7602)
+				seem to be giving pretty accurate results for the XYZ co-ordinates for this manufacturer.
+				Separating these out in a separate if-else because I do not want to touch Centralite part
+				as of now.
+			*/
+
+			"zcl mfg-code ${manufacturerCode}", "delay 200",
+			"zcl global write 0xFC02 0 0x20 {01}", "delay 200",
+			"send 0x${device.deviceNetworkId} 1 1", "delay 400",
+
+			"zcl mfg-code ${manufacturerCode}", "delay 200",
+			"zcl global write 0xFC02 2 0x21 {7602}", "delay 200",
+			"send 0x${device.deviceNetworkId} 1 1", "delay 400",
+		]
 	} else {
-		refreshCmds += zigbee.writeAttribute(0xFC02, 0x0000, 0x20, 0x02, [mfgCode: manufacturerCode])
+		refreshCmds = refreshCmds + [
+			/* sensitivity - default value (8) */
+			"zcl mfg-code ${manufacturerCode}", "delay 200",
+			"zcl global write 0xFC02 0 0x20 {02}", "delay 200",
+			"send 0x${device.deviceNetworkId} 1 1", "delay 400",
+		]
 	}
 
 	//Common refresh commands
-	refreshCmds += zigbee.readAttribute(0x0402, 0x0000) +
-			zigbee.readAttribute(0x0001, 0x0020) +
-			zigbee.readAttribute(0xFC02, 0x0010, [mfgCode: manufacturerCode])
+	refreshCmds = refreshCmds + [
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200",
+
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
+		"zcl global read 0xFC02 0x0010",
+		"send 0x${device.deviceNetworkId} 1 1","delay 400"
+	]
 
 	return refreshCmds + enrollResponse()
 }
@@ -425,15 +443,38 @@ def refresh() {
 def configure() {
 	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting"
 
-	def configCmds = enrollResponse() +
-			zigbee.batteryConfig() +
-			zigbee.temperatureConfig() +
-			zigbee.configureReporting(0xFC02, 0x0010, 0x18, 10, 3600, 0x01, [mfgCode: manufacturerCode]) +
-			zigbee.configureReporting(0xFC02, 0x0012, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
-			zigbee.configureReporting(0xFC02, 0x0013, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
-			zigbee.configureReporting(0xFC02, 0x0014, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode])
+	def configCmds = [
+		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+
+		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 200",
+		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}", "delay 200",		//checkin time 6 hrs
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+
+		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x402 {${device.zigbeeId}} {}", "delay 200",
+		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+
+		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0xFC02 {${device.zigbeeId}} {}", "delay 200",
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0010 0x18 10 3600 {01}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0012 0x29 1 3600 {0100}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0013 0x29 1 3600 {0100}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0014 0x29 1 3600 {0100}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
+		]
 
 	return configCmds + refresh()
 }

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-motion-sensor.src/zwave-motion-sensor.groovy

@@ -21,13 +21,6 @@ metadata {
 		capability "Motion Sensor"
 		capability "Sensor"
 		capability "Battery"
-
-		fingerprint mfr: "011F", prod: "0001", model: "0001", deviceJoinName: "Schlage Motion Sensor"  // Schlage motion
-		fingerprint mfr: "014A", prod: "0001", model: "0001", deviceJoinName: "Ecolink Motion Sensor"  // Ecolink motion
-		fingerprint mfr: "014A", prod: "0004", model: "0001", deviceJoinName: "Ecolink Motion Sensor"  // Ecolink motion +
-		fingerprint mfr: "0060", prod: "0001", model: "0002", deviceJoinName: "Everspring Motion Sensor"  // Everspring SP814
-		fingerprint mfr: "0060", prod: "0001", model: "0003", deviceJoinName: "Everspring Motion Sensor"  // Everspring HSP02
-		fingerprint mfr: "011A", prod: "0601", model: "0901", deviceJoinName: "Enerwave Motion Sensor"  // Enerwave ZWN-BPC
 	}
 
 	simulator {
@@ -132,9 +125,9 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
 	}
 	if (!state.lastbat || (new Date().time) - state.lastbat > 53*60*60*1000) {
 		result << response(zwave.batteryV1.batteryGet())
-	} else {
-		result << response(zwave.wakeUpV1.wakeUpNoMoreInformation())
+		result << response("delay 1200")
 	}
+	result << response(zwave.wakeUpV1.wakeUpNoMoreInformation())
 	result
 }
 

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/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) {