MSA-1382: the inclusion of these two apps would help me complete the home automation. Thanks

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

@@ -0,0 +1,600 @@
+/**
+ *  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/aeon-multisensor-6.src/aeon-multisensor-6.groovy

@@ -22,14 +22,12 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
 
 		attribute "tamper", "enum", ["detected", "clear"]
 		attribute "batteryStatus", "string"
 		attribute "powerSupply", "enum", ["USB Cable", "Battery"]
 
 		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A", outClusters: "0x5A"
-		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A,0x5A"
 	}
 
 	simulator {
@@ -328,9 +326,6 @@ 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 = []
@@ -357,7 +352,7 @@ def configure() {
 									motionSensitivity == "minimum" ? 0 : 64)
 
 	//5. report every x minutes (threshold reports don't work on battery power, default 8 mins)
-	request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: (8*60)) //association group 1
+	request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: 8*60) //association group 1
 
 	request << zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 6*60*60)  //association group 2
 

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

@@ -20,9 +20,6 @@ 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"
 	}
@@ -248,8 +245,6 @@ 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,7 +20,6 @@ metadata {
 		capability "Illuminance Measurement"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
 
 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x31,0x80,0x84,0x70,0x85,0x72,0x86"
 	}
@@ -181,9 +180,6 @@ 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/dimmer-switch.src/dimmer-switch.groovy

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

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

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

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

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

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

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

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

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

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

@@ -234,8 +234,7 @@ def getTemperature(value) {
 			def minVolts = 2.1
 			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			def roundedPct = Math.round(pct * 100)
-			result.value = Math.min(100, roundedPct)
+			result.value = Math.min(100, (int) pct * 100)
 			result.descriptionText = "${linkText} battery was ${result.value}%"
 		}
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -689,7 +689,7 @@ def parse(childDevice, description) {
             	log.warn "Parsing Body failed - trying again..."
                 poll()
             }
-            if (body instanceof java.util.Map) {
+            if (body instanceof java.util.HashMap) {
             	//poll response
                 def bulbs = getChildDevices()
                 for (bulb in body) {
@@ -830,22 +830,22 @@ def setColorTemperature(childDevice, huesettings) {
 
 def setColor(childDevice, huesettings) {
     log.debug "Executing 'setColor($huesettings)'"
-
+    
     def value = [:]
     def hue = null
     def sat = null
     def xy = null
-
+    
     if (huesettings.hex != null) {
         value.xy = getHextoXY(huesettings.hex)
     } else {
         if (huesettings.hue != null)
             value.hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
-        if (huesettings.saturation != null)
+        if (huesettings.saturation != null)   
             value.sat = Math.min(Math.round(huesettings.saturation * 255 / 100), 255)
     }
-
-    // Default behavior is to turn light on
+    
+    // Default behavior is to turn light on 
     value.on = true
 
     if (huesettings.level != null) {
@@ -853,7 +853,7 @@ def setColor(childDevice, huesettings) {
             value.on = false
         else if (huesettings.level == 1)
             value.bri = 1
-        else
+        else 
             value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
     }
     value.alert = huesettings.alert ? huesettings.alert : "none"

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

@@ -688,7 +688,7 @@ 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
+		return command in capabilityCommands[currentDeviceCapability] ? true : false
 	} else {
 		// Handling other device types here, which don't accept commands
 		httpError(400, "Bad request.")
@@ -823,8 +823,8 @@ def deviceHandler(evt) {
 }
 
 def sendToHarmony(evt, String callbackUrl) {
-  def callback = new URI(callbackUrl)
-  if (callback.port != -1) {
+	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(
@@ -852,6 +852,25 @@ def sendToHarmony(evt, String callbackUrl) {
   }
 }
 
+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 listHubs() {
 	location.hubs?.findAll { it.type.toString() == "PHYSICAL" }?.collect { hubItem(it) }
 }

smartapps/ucic-io/ubi.src/ubi.groovy

@@ -1,520 +0,0 @@
-/**
- *  Ubi
- *
- *  Copyright 2016 UCIC
- *
- *  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: "Ubi",
-    namespace: "ucic.io",
-    author: "UCIC",
-    description: "Connect Ubi with SmartThings",
-    category: "SmartThings Labs",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/ubi-app-icn.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/ubi-app-icn@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Partner/ubi-app-icn@2x.png",
-    oauth: true)
-
-
-preferences {
-	section("Allow a web application to control these things...") {
-		input name: "switches", type: "capability.switch", title: "Which Switches?", multiple: true, required: false
-		input name: "motions", type: "capability.motionSensor", title: "Which Motion Sensors?", multiple: true, required: false
-		input name: "locks", type: "capability.lock", title: "Which Locks?", multiple: true, required: false
-		input name: "contactSensors", type: "capability.contactSensor", title: "Which Contact Sensors?", multiple: true, required: false
-		input name: "presenceSensors", type: "capability.presenceSensor", title: "Which Presence Sensors?", multiple: true, required: false
-	}
-}
-
-mappings {
-	path("/list") {
-		action: [
-			GET: "listAll"
-		]
-	}
-
-	path("/events/:id") {
-		action: [
-			GET: "showEvents"
-		]
-	}
-
-	path("/switches") {
-		action: [
-			GET: "listSwitches",
-			PUT: "updateSwitches",
-			POST: "updateSwitches"
-		]
-	}
-	path("/switches/:id") {
-		action: [
-			GET: "showSwitch",
-			PUT: "updateSwitch",
-			POST: "updateSwitch"
-		]
-	}
-	path("/switches/subscriptions") {
-		//log.debug "switches added"
-		action: [
-			POST: "addSwitchSubscription"
-		]
-	}
-	path("/switches/subscriptions/:id") {
-		action: [
-			DELETE: "removeSwitchSubscription",
-			GET: "removeSwitchSubscription"
-		]
-	}
-
-	path("/motionSensors") {
-		action: [
-			GET: "listMotions",
-			PUT: "updateMotions",
-			POST: "updateMotions"
-
-		]
-	}
-	path("/motionSensors/:id") {
-		action: [
-			GET: "showMotion",
-			PUT: "updateMotion",
-			POST: "updateMotion"
-		]
-	}
-	path("/motionSensors/subscriptions") {
-		//log.debug "motionSensors added"
-		action: [
-			POST: "addMotionSubscription"
-		]
-	}
-	path("/motionSensors/subscriptions/:id") {
-		//log.debug "motionSensors Deleted"
-		action: [
-			DELETE: "removeMotionSubscription",
-			GET: "removeMotionSubscription"
-		]
-	}
-
-	path("/locks") {
-		action: [
-			GET: "listLocks",
-			PUT: "updateLock",
-			POST: "updateLock"
-		]
-	}
-	path("/locks/:id") {
-		action: [
-			GET: "showLock",
-			PUT: "updateLock",
-			POST: "updateLock"
-		]
-	}
-	path("/locks/subscriptions") {
-		action: [
-			POST: "addLockSubscription"
-		]
-	}
-	path("/locks/subscriptions/:id") {
-		action: [
-			DELETE: "removeLockSubscription",
-			GET: "removeLockSubscription"
-		]
-	}
-
-	path("/contactSensors") {
-		action: [
-			GET: "listContactSensors",
-			PUT: "updateContactSensor",
-			POST: "updateContactSensor"
-		]
-	}
-	path("/contactSensors/:id") {
-		action: [
-			GET: "showContactSensor",
-			PUT: "updateContactSensor",
-			POST: "updateContactSensor"
-		]
-	}
-	path("/contactSensors/subscriptions") {
-		log.debug "contactSensors/subscriptions"
-		action: [
-			POST: "addContactSubscription"
-		]
-	}
-	path("/contactSensors/subscriptions/:id") {
-		action: [
-			DELETE: "removeContactSensorSubscription",
-			GET: "removeContactSensorSubscription"
-		]
-	}
-
-	path("/presenceSensors") {
-		action: [
-			GET: "listPresenceSensors",
-			PUT: "updatePresenceSensor",
-			POST: "updatePresenceSensor"
-		]
-	}
-	path("/presenceSensors/:id") {
-		action: [
-			GET: "showPresenceSensor",
-			PUT: "updatePresenceSensor",
-			POST: "updatePresenceSensor"
-		]
-	}
-	path("/presenceSensors/subscriptions") {
-		//log.debug "PresenceSensors/subscriptions"
-		action: [
-			POST: "addPresenceSubscription"
-		]
-	}
-	path("/presenceSensors/subscriptions/:id") {
-		action: [
-			DELETE: "removePresenceSensorSubscription",
-			GET: "removePresenceSensorSubscription"
-		]
-	}
-
-	path("/state") {
-		action: [
-			GET: "currentState"
-		]
-	}
-
-	path("/phrases") {
-		action: [
-			GET: "listPhrases"
-		]
-	}
-	path("/phrases/:phraseName") {
-		action: [
-			GET: "executePhrase",
-			POST: "executePhrase",
-		]
-	}
-
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	//unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	// TODO: subscribe to attributes, devices, locations, etc.
-    log.debug "initialize, do nothing..."
-}
-
-def listAll() {
-	listSwitches() + listMotions() + listLocks() + listContactSensors() + listPresenceSensors()
-}
-
-def listContactSensors() {
-	contactSensors.collect { device(it, "contactSensor") }
-}
-
-
-void updateContactSensors() {
-	updateAll(contactSensors)
-}
-
-def showContactSensor() {
-	show(contactSensors, "contact")
-}
-
-void updateContactSensor() {
-	update(contactSensors)
-}
-
-def addContactSubscription() {
-	log.debug "addContactSensorSubscription,  params: ${params}"
-	addSubscription(contactSensors, "contact")
-}
-
-def removeContactSensorSubscription() {
-	removeSubscription(contactSensors)
-}
-
-
-def listPresenceSensors() {
-	presenceSensors.collect { device(it, "presenceSensor") }
-}
-
-
-void updatePresenceSensors() {
-	updateAll(presenceSensors)
-}
-
-def showPresenceSensor() {
-	show(presenceSensors, "presence")
-}
-
-void updatePresenceSensor() {
-	update(presenceSensors)
-}
-
-def addPresenceSubscription() {
-	log.debug "addPresenceSensorSubscription,  params: ${params}"
-	addSubscription(presenceSensors, "presence")
-}
-
-def removePresenceSensorSubscription() {
-	removeSubscription(presenceSensors)
-}
-
-
-def listSwitches() {
-	switches.collect { device(it, "switch") }
-}
-
-void updateSwitches() {
-	updateAll(switches)
-}
-
-def showSwitch() {
-	show(switches, "switch")
-}
-
-void updateSwitch() {
-	update(switches)
-}
-
-def addSwitchSubscription() {
-	log.debug "addSwitchSubscription,  params: ${params}"
-	addSubscription(switches, "switch")
-}
-
-def removeSwitchSubscription() {
-	removeSubscription(switches)
-}
-
-def listMotions() {
-	motions.collect { device(it, "motionSensor") }
-}
-
-void updateMotions() {
-	updateAll(motions)
-}
-
-def showMotion() {
-	show(motions, "motion")
-}
-
-void updateMotion() {
-	update(motions)
-}
-
-def addMotionSubscription() {
-
-	addSubscription(motions, "motion")
-}
-
-def removeMotionSubscription() {
-	removeSubscription(motions)
-}
-
-def listLocks() {
-	locks.collect { device(it, "lock") }
-}
-
-void updateLocks() {
-	updateAll(locks)
-}
-
-def showLock() {
-	show(locks, "lock")
-}
-
-void updateLock() {
-	update(locks)
-}
-
-def addLockSubscription() {
-	addSubscription(locks, "lock")
-}
-
-def removeLockSubscription() {
-	removeSubscription(locks)
-}
-
-/*
-def motionOpenHandler(evt) {
-//log.trace "$evt.value: $evt, $settings"
-
-	log.debug "$motions was active, sending push message to user"
-	//sendPush("Your ${contact1.label ?: contact1.name} was opened")
-
-
-	httpPostJson(uri: "http://automatesolutions.ca/test.php", path: '', body: [evt: [value: "motionSensor Active"]]) {
-	log.debug "Event data successfully posted"
-    }
-
-}
-def contactOpenHandler(evt) {
-	//log.trace "$evt.value: $evt, $settings"
-
-	log.debug "$contactSensors was opened, sending push message to user"
-	//sendPush("Your ${contact1.label ?: contact1.name} was opened")
-
-
-	httpPostJson(uri: "http://automatesolutions.ca/test.php", path: '', body: [evt: [value: "ContactSensor Opened"]]) {
-	log.debug "Event data successfully posted"
-    }
-
-
-}
-*/
-
-
-def deviceHandler(evt) {
-	log.debug "~~~~~TEST~~~~~~"
-	def deviceInfo = state[evt.deviceId]
-	if (deviceInfo)
-	{
-		httpPostJson(uri: deviceInfo.callbackUrl, path: '', body: [evt: [value: evt.value]]) {
-			log.debug "Event data successfully posted"
-		}
-	}
-	else
-	{
-		log.debug "No subscribed device found"
-	}
-}
-
-def currentState() {
-	state
-}
-
-def showStates() {
-	def device = (switches + motions + locks).find { it.id == params.id }
-	if (!device)
-	{
-		httpError(404, "Switch not found")
-	}
-	else
-	{
-		device.events(params)
-	}
-}
-
-def listPhrases() {
-	location.helloHome.getPhrases().label
-}
-
-def executePhrase() {
-	def phraseName = params.phraseName
-	if (phraseName)
-	{
-		location.helloHome.execute(phraseName)
-		log.debug "executed phrase: $phraseName"
-	}
-	else
-	{
-		httpError(404, "Phrase not found")
-	}
-}
-
-private void updateAll(devices) {
-	def command = request.JSON?.command
-	if (command)
-	{
-		command = command.toLowerCase()
-		devices."$command"()
-	}
-}
-
-private void update(devices) {
-	log.debug "update, request: ${request.JSON}, params: ${params}, devices: $devices.id"
-	//def command = request.JSON?.command
-	def command = params.command
-	if (command)
-	{
-		command = command.toLowerCase()
-		def device = devices.find { it.id == params.id }
-		if (!device)
-		{
-			httpError(404, "Device not found")
-		}
-		else
-		{
-			device."$command"()
-		}
-	}
-}
-
-private show(devices, type) {
-	def device = devices.find { it.id == params.id }
-	if (!device)
-	{
-		httpError(404, "Device not found")
-	}
-	else
-	{
-
-		def attributeName = type
-
-
-
-		def s = device.currentState(attributeName)
-		[id: device.id, label: device.displayName, value: s?.value, unitTime: s?.date?.time, type: type]
-	}
-}
-
-private addSubscription(devices, attribute) {
-	//def deviceId = request.JSON?.deviceId
-	//def callbackUrl = request.JSON?.callbackUrl
-
-	log.debug "addSubscription,  params: ${params}"
-
-	def deviceId = params.deviceId
-	def callbackUrl = params.callbackUrl
-
-
-
-
-	def myDevice = devices.find { it.id == deviceId }
-	if (myDevice)
-	{
-		if (state[deviceId])
-		{
-			log.debug "Switch subscription already exists, unsubcribing"
-			unsubscribe(myDevice)
-		}
-		log.debug "Adding switch subscription" + callbackUrl
-		state[deviceId] = [callbackUrl: callbackUrl]
-		log.debug "Added state: $state"
-		subscribe(myDevice, attribute, deviceHandler)
-	}
-}
-
-private removeSubscription(devices) {
-	def deviceId = params.id
-	def device = devices.find { it.id == deviceId }
-	if (device)
-	{
-		log.debug "Removing $device.displayName subscription"
-		state.remove(device.id)
-		unsubscribe(device)
-	}
-}
-
-private device(it, type) {
-	it ? [id: it.id, label: it.displayName, type: type] : null
-}