MSA-1386: nest proper

Rolling down staging hotfix to master

devicetypes/cmonroe/nest-protect-direct.src/nest-protect-direct.groovy

@@ -0,0 +1,471 @@
+/**
+ *  Nest Protect (Direct)
+ *  Author: chad@monroe.io
+ *  Author: nick@nickhbailey.com
+ *  Author: dianoga7@3dgo.net
+ *  Date: 2016.01.24
+ *
+ *
+ * INSTALLATION
+ * =========================================
+ * 1) Create a new device type from code (https://graph.api.smartthings.com/ide/devices)
+ *      Copy and paste the below, save, publish "For Me"
+ *
+ * 2) Create a new device (https://graph.api.smartthings.com/device/list)
+ *     Name: Your Choice
+ *     Device Network Id: Your Choice
+ *     Type: Nest Protect (should be the last option)
+ *     Location: Choose the correct location
+ *     Hub/Group: Leave blank
+ *
+ * 3) 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 smoke detector
+ *     you want to see. Under settings, go to Technical Info. Your serial number is
+ *     the second item.
+ *
+ * Original design/inspiration provided by:
+ *  -> https://github.com/sidjohn1/SmartThings-NestProtect
+ *  -> https://gist.github.com/Dianoga/6055918
+ *
+ * Copyright (C) 2016 Chad Monroe <chad@monroe.io>
+ * Copyright (C) 2014 Nick Bailey <nick@nickhbailey.com>
+ * 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.
+ **/
+
+ /**
+  * Static info
+  */
+  private NEST_LOGIN_URL()		{ "https://home.nest.com/user/login" }
+  private USER_AGENT_STR()		{ "Nest/1.1.0.10 CFNetwork/548.0.4" }
+
+preferences 
+{
+	input( "username", "text", title: "Username", description: "Your Nest Username (usually an email address)", required: true, displayDuringSetup: true )
+	input( "password", "password", title: "Password", description: "Your Nest Password", required: true, displayDuringSetup: true )
+	input( "mac", "text", title: "MAC Address", description: "The MAC address of your smoke detector", required: true, displayDuringSetup: true )
+}
+
+metadata 
+{
+	definition( name: "Nest Protect - Direct", author: "chad@monroe.io", namespace: "cmonroe" ) 
+	{
+		capability "Polling"
+		capability "Refresh"
+		capability "Battery"
+		capability "Smoke Detector"
+		capability "Carbon Monoxide Detector"
+        
+		attribute "alarm_state", "string"
+		attribute "night_light", "string"
+		attribute "line_power", "string"
+		attribute "co_previous_peak", "string"
+		attribute "wifi_ip", "string"
+		attribute "version_hw", "string"
+		attribute "version_sw", "string"
+		attribute "secondary_status", "string"
+	}
+
+	simulator 
+	{
+		/* TODO */
+	}
+
+	tiles( scale: 2 ) 
+	{
+		multiAttributeTile( name:"alarm_state", type: "lighting", width: 6, height: 4 ) 
+		{
+			tileAttribute( "device.alarm_state", key: "PRIMARY_CONTROL" ) 
+			{
+				attributeState( "default", label:'--', icon: "st.unknown.unknown.unknown" )
+				attributeState( "clear", label:"CLEAR", icon:"st.alarm.smoke.clear", backgroundColor:"#44b621" )
+				attributeState( "smoke", label:"SMOKE", icon:"st.alarm.smoke.smoke", backgroundColor:"#e86d13" )
+				attributeState( "co", label:"CO", icon:"st.alarm.carbon-monoxide.carbon-monoxide", backgroundColor:"#e86d13" )
+				attributeState( "tested", label:"TEST", icon:"st.alarm.smoke.test", backgroundColor:"#e86d13" )
+			}
+
+			tileAttribute( "device.status_text", key: "SECONDARY_CONTROL" ) 
+			{
+				attributeState( "status_text", label: '${currentValue}', unit:"" )
+			}
+		}
+        
+		standardTile( "smoke", "device.smoke", width: 2, height: 2 ) 
+		{
+			state( "default", label:'UNK', icon: "st.unknown.unknown.unknown" )
+			state( "clear", label:"OK", icon:"st.alarm.smoke.clear", backgroundColor:"#44B621" )
+			state( "detected", label:"SMOKE", icon:"st.alarm.smoke.smoke", backgroundColor:"#e86d13" )
+			state( "tested", label:"TEST", icon:"st.alarm.smoke.test", backgroundColor:"#e86d13" )
+		}
+
+		standardTile( "carbonMonoxide", "device.carbonMonoxide", width: 2, height: 2 ) 
+		{
+			state( "default", label:'UNK', icon: "st.unknown.unknown.unknown" )
+			state( "clear", label:"OK", icon:"st.alarm.carbon-monoxide.carbon-monoxide", backgroundColor:"#44B621" )
+			state( "detected", label:"CO", icon:"st.alarm.carbon-monoxide.clear", backgroundColor:"#e86d13" )
+			state( "tested", label:"TEST", icon:"st.alarm.carbon-monoxide.test", backgroundColor:"#e86d13" )
+		}
+
+		standardTile( "night_light", "device.night_light", width: 2, height: 2 ) 
+		{
+			state( "default", label:'UNK', icon: "st.unknown.unknown.unknown" )
+			state( "unk", label:'UNK', icon: "st.unknown.unknown.unknown" )
+			state( "on", label: 'ON', icon: "st.switches.light.on", backgroundColor: "#44B621" )
+			state( "low", label: 'LOW', icon: "st.switches.light.on", backgroundColor: "#44B621" )
+			state( "med", label: 'MED', icon: "st.switches.light.on", backgroundColor: "#44B621" )
+			state( "high", label: 'HIGH', icon: "st.switches.light.on", backgroundColor: "#44B621" )
+			state( "off", label: 'OFF', icon: "st.switches.light.off", backgroundColor: "#ffffff" )
+		}
+        
+		valueTile( "version_hw", "device.version_hw", width: 2, height: 2, decoration: "flat" ) 
+		{
+			state( "default", label: 'Hardware ${currentValue}' )
+		}
+
+		valueTile( "co_previous_peak", "device.co_previous_peak", width: 2, height: 2 ) 
+		{
+			state( "co_previous_peak", label: '${currentValue}', unit: "ppm",
+				backgroundColors: [
+					[value: 69, color: "#44B621"],
+					[value: 70, color: "#e86d13"]
+				]
+			)
+ 		}
+
+		valueTile( "version_sw", "device.version_sw", width: 2, height: 2, decoration: "flat" ) 
+		{
+			state( "default", label: 'Software ${currentValue}' )
+		}
+        
+		standardTile("refresh", "device.refresh", inactiveLabel: false, width: 2, height: 2, decoration: "flat")
+		{
+			state( "default", label:'refresh', action:"polling.poll", icon:"st.secondary.refresh-icon" )
+		}
+
+		valueTile("wifi_ip", "device.wifi_ip", inactiveLabel: false, width: 4, height: 2, decoration: "flat")
+		{
+			state( "default", label:'IP: ${currentValue}', height: 1, width: 2, inactiveLabel: false )
+		}
+
+	main "alarm_state"
+	details( ["alarm_state", "smoke", "carbonMonoxide", "night_light", "version_hw", "co_previous_peak", "version_sw", "wifi_ip", "refresh"] )
+    }
+}
+
+
+/**
+ * handle commands
+ */
+def installed()
+{
+	log.info "Nest Protect - Direct ${textVersion()}: ${textCopyright()} Installed"
+	do_update()
+}
+
+def initialize() 
+{
+	log.info "Nest Protect - Direct ${textVersion()}: ${textCopyright()} Initialized"
+	do_update()
+}
+
+def updated() 
+{
+	log.info "Nest Protect - Direct ${textVersion()}: ${textCopyright()} Updated"
+	data.auth = null
+}
+
+def poll() 
+{
+	log.debug "poll for protect with MAC: " + settings.mac.toUpperCase()
+	do_update()
+}
+
+def refresh() 
+{
+	log.debug "refresh for protect with MAC: " + settings.mac.toUpperCase()
+	do_update()
+}
+
+def reschedule()
+{
+	log.debug "re-scheduling update for protect with MAC: " + settings.mac.toUpperCase()
+	runIn( 300, 'do_update' )
+}
+
+def do_update()
+{
+	log.debug "refresh for device with MAC: " + settings.mac.toUpperCase()
+
+	api_exec( 'status', [] ) 
+	{
+		def status_text = ""
+        
+		data.topaz = it.data.topaz.getAt( settings.mac.toUpperCase() )
+
+		//log.debug data.topaz
+
+		data.topaz.smoke_status = data.topaz.smoke_status == 0 ? 'clear' : 'detected'
+		data.topaz.co_status = data.topaz.co_status == 0 ? 'clear' : 'detected'
+		data.topaz.battery_health_state = data.topaz.battery_health_state  == 0 ? 'ok' : 'low'
+		data.topaz.kl_software_version = "v" + data.topaz.kl_software_version.split('Software ')[-1]
+		data.topaz.model = "v" + data.topaz.model.split('-')[-1]
+
+		if ( data.topaz.night_light_enable )
+		{
+			switch ( data.topaz.night_light_brightness )
+			{
+				case 1:
+					data.topaz.night_light_brightness = "low"
+					break
+				case 2:
+					data.topaz.night_light_brightness = "med"
+					break
+ 				case 3:
+					data.topaz.night_light_brightness = "high"
+					break
+				default:
+					data.topaz.night_light_brightness = "on"
+					break
+			}
+		}
+		else
+		{
+			data.topaz.night_light_brightness = "off"
+		}
+
+		if ( data.topaz.line_power_present )
+		{
+			data.topaz.line_power_present = "ok"
+		}
+		else
+		{
+			data.topaz.line_power_present = "dead"
+		}
+
+		if ( !data.topaz.co_previous_peak )
+		{
+			/* protect 2.0 units do not support this */
+			data.topaz.co_previous_peak = 'N/A'
+		}
+		else
+		{
+			data.topaz.co_previous_peak = "${data.topaz.co_previous_peak}ppm"
+		}
+
+		sendEvent( name: 'smoke', value: data.topaz.smoke_status, descriptionText: "${device.displayName} smoke ${data.topaz.smoke_status}", displayed: false )
+		sendEvent( name: 'carbonMonoxide', value: data.topaz.co_status, descriptionText: "${device.displayName} carbon monoxide ${data.topaz.co_status}", displayed: false )
+		sendEvent( name: 'battery', value: data.topaz.battery_health_state, descriptionText: "${device.displayName} battery is ${data.topaz.battery_health_state}", displayed: false )
+		sendEvent( name: 'night_light', value: data.topaz.night_light_brightness, descriptionText: "${device.displayName} night light is ${data.topaz.night_light_brightness}", displayed: true )
+		sendEvent( name: 'line_power', value: data.topaz.line_power_present, descriptionText: "${device.displayName} line power is ${data.topaz.line_power_present}", displayed: false )
+		sendEvent( name: 'co_previous_peak', value: data.topaz.co_previous_peak, descriptionText: "${device.displayName} previous CO peak (PPM) is ${data.topaz.co_previous_peak}", displayed: false )
+		sendEvent( name: 'wifi_ip', value: data.topaz.wifi_ip_address, descriptionText: "${device.displayName} WiFi IP is ${data.topaz.wifi_ip_address}", displayed: false )
+		sendEvent( name: 'version_hw', value: data.topaz.model, descriptionText: "${device.displayName} hardware model is ${data.topaz.model}", displayed: false )
+		sendEvent( name: 'version_sw', value: data.topaz.kl_software_version, descriptionText: "${device.displayName} software version is ${data.topaz.kl_software_version}", displayed: false )
+        
+		app_alarm_sm()
+        
+		status_text = "Line Power: ${device.currentState('line_power').value}   Battery: ${device.currentState('battery').value}"
+		sendEvent( name: 'status_text', value: status_text, descriptionText: status_text, displayed: false )
+
+		log.debug "Smoke: ${data.topaz.smoke_status}"
+		log.debug "CO: ${data.topaz.co_status}"
+		log.debug "Battery: ${data.topaz.battery_health_state}"
+		log.debug "Night Light: ${data.topaz.night_light_brightness}"
+		log.debug "Line Power: ${data.topaz.line_power_present}"
+		log.debug "CO Previous Peak (PPM): ${data.topaz.co_previous_peak}"
+		log.debug "WiFi IP: ${data.topaz.wifi_ip_address}"
+		log.debug "Hardware Version: ${data.topaz.model}"
+		log.debug "Software Version: ${data.topaz.kl_software_version}"
+    }
+    
+    reschedule()
+}
+
+/**
+ * state machine for setting global alarm state of app
+ */
+ def app_alarm_sm()
+ {
+ 	def alarm_state = "clear"
+ 	def smoke = data.topaz.smoke_status
+ 	def co = data.topaz.co_status
+
+ 	switch( smoke )
+ 	{
+ 		case 'clear':
+ 			if ( co != "clear" )
+ 			{
+ 				alarm_state = "co"
+ 			}
+ 			break
+ 		case 'detected':
+ 			alarm_state = "smoke"
+ 			break
+ 		case 'tested':
+ 		default:
+ 			/**
+ 			 * ensure that real co alarm is not set before sending tested alarm for smoke
+ 			 */
+ 			if ( co == 'detected' )
+ 			{
+ 				alarm_state = "co"
+ 			}
+ 			break
+ 	}
+
+ 	log.info "alarm state machine finished, sending event.."
+ 	log.info "alarm_state: ${alarm_state} smoke: ${smoke} CO: ${co}"
+
+ 	sendEvent( name: 'alarm_state', value: alarm_state, descriptionText: "Alarm: ${alarm_state} (Smoke/CO: ${smoke}/${co})", type: "physical", displayed: true, isStateChange: true )
+ }
+
+/**
+ * main entry point for nest API calls
+ */
+def api_exec(method, args = [], success = {}) 
+{
+	log.debug "API exec method: ${method} with args: ${args}"
+
+	if( !logged_in() ) 
+	{
+		log.debug "login required"
+
+		login(method, args, success)
+		return
+	}
+    
+	if( method == null ) 
+	{
+		log.info "API exec with no method passed and we are already logged in; bailing"
+		return
+	}
+
+	def methods = 
+	[
+		'status': 
+		[
+			uri: "/v2/mobile/${data.auth.user}", type: 'get' 
+		],
+	]
+
+	def request = methods.getAt( method )
+
+	log.debug "already logged in"
+
+	handle_request( request.uri, args, request.type, success )
+}
+
+/**
+ * handle_request() only works once logged in, therefor
+ * call api_exec() rather than this method directly.
+ */
+def handle_request(uri, args, type, success) 
+{
+	log.debug "handling request type: ${type} at URI: ${uri} with args: ${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}",
+			'Accept-Language': 'en-us',
+			'userAgent':  USER_AGENT_STR()
+		],
+		body: args
+	]
+
+	def post_request = { response ->
+		
+		if( response.getStatus() == 302 ) 
+		{
+			def locations = response.getHeaders( "Location" )
+			def location = locations[0].getValue()
+			
+			log.debug "redirecting to ${location}"
+			
+			handle_request( location, args, type, success )
+		} 
+		else
+		{
+			success.call( response )
+		}
+	}
+
+	try 
+	{
+		if( type == 'get' ) 
+		{
+			httpGet( params, post_request )
+		}
+	} 
+	catch( Throwable e ) 
+	{
+		login()
+	}
+}
+
+def login(method = null, args = [], success = {}) 
+{
+	def params = 
+	[
+		uri: NEST_LOGIN_URL(),
+		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_exec( method, args, success )
+	}
+}
+
+def logged_in() 
+{
+	if( !data.auth ) 
+	{
+		log.debug "data.auth is missing, not logged in"
+		return false
+	}
+
+	def now = new Date().getTime();
+	
+	return( data.auth.expires_in > now )
+}
+
+private def textVersion() 
+{
+	def text = "Version 1.6"
+}
+
+private def textCopyright() 
+{
+	def text = "Copyright © 2016 Chad Monroe <chad@monroe.io>"
+}

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

@@ -15,12 +15,13 @@
  */
  
 metadata {
-	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
 		capability "Battery"
 		capability "Configuration"
 		capability "Contact Sensor"
 		capability "Refresh"
 		capability "Temperature Measurement"
+		capability "Health Check"
         
 		command "enrollResponse"
  
@@ -273,7 +274,8 @@ def refresh() {
 }
 
 def configure() {
-
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
+	
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
 	def configCmds = [

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

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

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

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

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

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

smartapps/mangioneimagery/medicine-management-contact-sensor.src/medicine-management-contact-sensor.groovy

@@ -1,188 +0,0 @@
-/**
- *  Medicine Management - Contact Sensor
- *
- *  Copyright 2016 Jim Mangione
- *
- *  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.
- *
- * Logic: 
- * --- Send notification at the medicine reminder time IF draw wasn't alread opened in past 60 minutes
- * --- If draw still isn't open 10 minutes AFTER reminder time, LED will turn RED.
- * --- ----- Once draw IS open, LED will return back to it's original color
- *
- */
-import groovy.time.TimeCategory 
-
-definition(
-    name: "Medicine Management - Contact Sensor",
-    namespace: "MangioneImagery",
-    author: "Jim Mangione",
-    description: "This supports devices with capabilities of ContactSensor and ColorControl (LED). It sends an in-app and ambient light notification if you forget to open the drawer or cabinet where meds are stored. A reminder will be set to a single time per day. If the draw or cabinet isn't opened within 60 minutes of that reminder, an in-app message will be sent. If the draw or cabinet still isn't opened after an additional 10 minutes, then an LED light turns red until the draw or cabinet is opened",
-    category: "Health & Wellness",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
-
-
-preferences {
-
-	section("My Medicine Draw/Cabinet"){
-		input "deviceContactSensor", "capability.contactSensor", title: "Opened Sensor" 
-	} 
-
-    section("Remind me to take my medicine at"){
-        input "reminderTime", "time", title: "Time"
-    }
-    
-    // NOTE: Use REAL device - virtual device causes compilation errors
-    section("My LED Light"){
-    	input "deviceLight", "capability.colorControl", title: "Smart light"
-    }
-
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-        
-	initialize()
-}
-
-def initialize() {
-
-    // will stop LED notification incase it was set by med reminder
-    subscribe(deviceContactSensor, "contact", contactHandler)
-
-    // how many minutes to look in the past from the reminder time, for an open draw
-    state.minutesToCheckOpenDraw = 60
-    
-    // is true when LED notification is set after exceeding 10 minutes past reminder time
-    state.ledNotificationTriggered = false
-    
-    // Set a timer to run once a day to notify if draw wasn't opened yet
-    schedule(reminderTime, checkOpenDrawInPast)
-   
-}
-
-// Should turn off any LED notification on OPEN state
-def contactHandler(evt){
-	if (evt.value == "open") {
-        // if LED notification triggered, reset it.
-        log.debug "Cabinet opened"
-        if (state.ledNotificationTriggered) {
-            resetLEDNotification()
-        }
-	}
-}
-
-// If the draw was NOT opened within 60 minutes of the timer send notification out.
-def checkOpenDrawInPast(){
-	log.debug "Checking past 60 minutes of activity from $reminderTime"
-    
-    // check activity of sensor for past 60 minutes for any OPENED status
-    def cabinetOpened = isOpened(state.minutesToCheckOpenDraw)
-	log.debug "Cabinet found opened: $cabinetOpened"
-    
-    // if it's opened, then do nothing and assume they took their meds
-    if (!cabinetOpened) {    
-    	sendNotification("Hi, please remember to take your meds in the cabinet")
-       
-       // if no open activity, send out notification and set new reminder    
-        def reminderTimePlus10 = new Date(now() + (10 * 60000))
-
-        // needs to be scheduled if draw wasn't already opened
-        runOnce(reminderTimePlus10, checkOpenDrawAfterReminder)
-    }
-}
-
-// If the draw was NOT opened after 10 minutes past reminder, use LED notification
-def checkOpenDrawAfterReminder(){
-	log.debug "Checking additional 10 minutes of activity from $reminderTime"
-    
-    // check activity of sensor for past 10 minutes for any OPENED status
-    def cabinetOpened = isOpened(10)    
-    
-   	log.debug "Cabinet found opened: $cabinetOpened"
-        
-    // if no open activity, blink lights
-    if (!cabinetOpened) {
-    	log.debug "Set LED to Notification color"
-        setLEDNotification()
-    }
-    
-}
-
-// Helper function for sending out an app notification
-def sendNotification(msg){
-        log.debug "Message Sent: $msg"
-        sendPush(msg)
-}
-
-// Check if the sensor has been opened since the minutes entered
-// Return true if opened found, else false.
-def isOpened(minutes){
-    // query last X minutes of activity log    
-    def previousDateTime = new Date(now() - (minutes * 60000))
-    
-    // capture all events recorded
-    def evts = deviceContactSensor.eventsSince(previousDateTime)   
-    def cabinetOpened = false
-    if (evts.size() > 0) {
-        evts.each{
-            if(it.value == "open") {
-                cabinetOpened = true 
-            }
-        }
-	}
-    
-    return cabinetOpened
-}
-
-// Saves current color and sets the light to RED
-def setLEDNotification(){
-
-	state.ledNotificationTriggered = true
-    
-	// turn light back off when reset is called if it was originally off
- 	state.ledState = deviceLight.currentValue("switch")
-
-	// set light to RED and store original color until stopped    
-    state.origColor = deviceLight.currentValue("hue")
-    deviceLight.on()
-    deviceLight.setHue(100)
-    
-    log.debug "LED set to RED. Original color stored: $state.origColor"
-
-}
-
-// Sets the color back to the original saved color
-def resetLEDNotification(){
-
-	state.ledNotificationTriggered = false
-    
-    // return color to original
-    log.debug "Reset LED color to: $state.origColor"
-    if (state.origColor != null) {
-    	deviceLight.setHue(state.origColor)
-    }
-    
-    // if the light was turned on just for the notification, turn it back off now
-    if (state.ledState == "off") {
-    	deviceLight.off()
-    }
-
-}

smartapps/mangioneimagery/medicine-management-temp-motion.src/medicine-management-temp-motion.groovy

@@ -1,189 +0,0 @@
-/**
- *  Medicine Management - Temp-Motion
- *
- *  Copyright 2016 Jim Mangione
- *
- *  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.
- *
- * Logic: 
- * --- If temp > threshold set, send notification
- * --- Send in-app notification at the medicine reminder time if no motion is detected in past 60 minutes
- * --- If motion still isn't detected 10 minutes AFTER reminder time, LED will turn RED
- * --- ----- Once motion is detected, LED will turn back to it's original color
- */
-import groovy.time.TimeCategory 
-
-definition(
-    name: "Medicine Management - Temp-Motion",
-    namespace: "MangioneImagery",
-    author: "Jim Mangione",
-    description: "This only supports devices with capabilities TemperatureMeasurement, AccelerationSensor and ColorControl (LED). Supports two use cases. First, will notifies via in-app if the fridge where meds are stored exceeds a temperature threshold set in degrees. Secondly, sends an in-app and ambient light notification if you forget to take your meds by sensing movement of the medicine box in the fridge. A reminder will be set to a single time per day. If the box isn't moved within 60 minutes of that reminder, an in-app message will be sent. If the box still isn't moved after an additional 10 minutes, then an LED light turns red until the box is moved",
-    category: "Health & Wellness",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
-
-
-preferences {
- 
-     section("My Medicine in the Refrigerator"){
-		input "deviceAccelerationSensor", "capability.accelerationSensor", required: true, multiple: false, title: "Movement"
-        input "deviceTemperatureMeasurement", "capability.temperatureMeasurement", required: true, multiple: false, title: "Temperature"
-	} 
-
-	section("Temperature Threshold"){
-    	input "tempThreshold", "number", title: "Temperature Threshold"
-    }
-
-    section("Remind me to take my medicine at"){
-        input "reminderTime", "time", title: "Time"
-    }
-    
-    // NOTE: Use REAL device - virtual device causes compilation errors
-    section("My LED Light"){
-    	input "deviceLight", "capability.colorControl", title: "Smart light"
-    }    
-
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-        
-	initialize()
-}
-
-def initialize() {
-	// will notify when temp exceeds max
-    subscribe(deviceTemperatureMeasurement, "temperature", tempHandler)
-
-    // will stop LED notification incase it was set by med reminder
-    subscribe(deviceAccelerationSensor, "acceleration.active", motionHandler)
-    
-    // how many minutes to look in the past from the reminder time
-    state.minutesToCheckPriorToReminder = 60
-    
-    // Set a timer to run once a day to notify if draw wasn't opened yet
-    schedule(reminderTime, checkMotionInPast)
-}
-
-
-// If temp > 39 then send an app notification out.
-def tempHandler(evt){
-	if (evt.doubleValue > tempThreshold) {
-    	log.debug "Fridge temp of $evt.value exceeded threshold"
-   		sendNotification("WARNING: Fridge temp is $evt.value with threshold of $tempThreshold")
-	}
-}
-
-// Should turn off any LED notification once motion detected
-def motionHandler(evt){
-    // always call out to stop any possible LED notification
-	log.debug "Medication moved. Send stop LED notification"
-    resetLEDNotification()
-}
-
-// If no motion detected within 60 minutes of the timer send notification out.
-def checkMotionInPast(){
-	log.debug "Checking past 60 minutes of activity from $reminderTime"
-    
-    // check activity of sensor for past 60 minutes for any OPENED status
-    def movement = isMoved(state.minutesToCheckPriorToReminder)
-	log.debug "Motion found: $movement"
-    
-    // if there was movement, then do nothing and assume they took their meds
-    if (!movement) {    
-    	sendNotification("Hi, please remember to take your meds in the fridge")
-    
-        // if no movement, send out notification and set new reminder    
-        def reminderTimePlus10 = new Date(now() + (10 * 60000))
-
-        // needs to be scheduled if draw wasn't already opened
-        runOnce(reminderTimePlus10, checkMotionAfterReminder)
-    }
-}
-
-// If still no movement after 10 minutes past reminder, use LED notification
-def checkMotionAfterReminder(){
-	log.debug "Checking additional 10 minutes of activity from $reminderTime"
-    
-    // check activity of sensor for past 10 minutes for any OPENED status
-    def movement = isMoved(10)    
-    
-   	log.debug "Motion found: $movement"
-        
-    // if no open activity, blink lights
-    if (!movement) {
-    	log.debug "Notify LED API"
-        setLEDNotification()
-    }
-    
-}
-
-// Helper function for sending out an app notification
-def sendNotification(msg){
-        log.debug "Message Sent: $msg"
-        sendPush(msg)
-}
-
-// Check if the accelerometer has been activated since the minutes entered
-// Return true if active, else false.
-def isMoved(minutes){
-    // query last X minutes of activity log    
-    def previousDateTime = new Date(now() - (minutes * 60000))
-    
-    // capture all events recorded
-    def evts = deviceAccelerationSensor.eventsSince(previousDateTime)   
-    def motion = false
-    if (evts.size() > 0) {
-        evts.each{
-            if(it.value == "active") {
-                motion = true 
-            }
-        }
-	}
-    
-    return motion
-}
-
-// Saves current color and sets the light to RED
-def setLEDNotification(){
-
-	// turn light back off when reset is called if it was originally off
- 	state.ledState = deviceLight.currentValue("switch")
-
-	// set light to RED and store original color until stopped    
-    state.origColor = deviceLight.currentValue("hue")
-    deviceLight.on()
-    deviceLight.setHue(100)
-    
-    log.debug "LED set to RED. Original color stored: $state.origColor"
-
-}
-
-// Sets the color back to the original saved color
-def resetLEDNotification(){
-
-    // return color to original
-    log.debug "Reset LED color to: $state.origColor"
-    deviceLight.setHue(state.origColor)
-    
-    // if the light was turned on just for the notification, turn it back off now
-    if (state.ledState == "off") {
-    	deviceLight.off()
-    }
-}