MSA-709: Manage authorized users and send notification when lock is unlocked. The notification includes who unlocked. Automatically lock it based on elapsed time or no motion detected near the lock

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

@@ -55,141 +55,136 @@ metadata {
 			}
 		}
 
-		standardTile("indicator", "device.indicatorStatus", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
+		standardTile("indicator", "device.indicatorStatus", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
 			state "when off", action:"indicator.indicatorWhenOn", icon:"st.indicators.lit-when-off"
 			state "when on", action:"indicator.indicatorNever", icon:"st.indicators.lit-when-on"
 			state "never", action:"indicator.indicatorWhenOff", icon:"st.indicators.never-lit"
 		}
-		standardTile("refresh", "device.switch", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
+
-			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		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", "refresh", "indicator"])
+		details(["switch", "level", "indicator", "refresh"])
+
 	}
 }
 
 def parse(String description) {
-	def item1 = [
+	def result = null
-		canBeCurrentState: false,
+	if (description != "updated") {
-		linkText: getLinkText(device),
+		log.debug "parse() >> zwave.parse($description)"
-		isStateChange: false,
+		def cmd = zwave.parse(description, [0x20: 1, 0x26: 1, 0x70: 1])
-		displayed: false,
+		if (cmd) {
-		descriptionText: description,
+			result = zwaveEvent(cmd)
-		value:  description
+		}
-	]
-	def result
-	def cmd = zwave.parse(description, [0x20: 1, 0x26: 1, 0x70: 1])
-	if (cmd) {
-		result = createEvent(cmd, item1)
 	}
-	else {
+	if (result?.name == 'hail' && hubFirmwareLessThan("000.011.00602")) {
-		item1.displayed = displayed(description, item1.isStateChange)
+		result = [result, response(zwave.basicV1.basicGet())]
-		result = [item1]
+		log.debug "Was hailed: requesting state update"
+	} else {
+		log.debug "Parse returned ${result?.descriptionText}"
 	}
-	log.debug "Parse returned ${result?.descriptionText}"
+	return result
-	result
 }
 
-def createEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd, Map item1) {
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
-	def result = doCreateEvent(cmd, item1)
+	dimmerEvents(cmd)
-	for (int i = 0; i < result.size(); i++) {
+}
-		result[i].type = "physical"
+
+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: "%")
 	}
-	result
+	return result
 }
 
-def createEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd, Map item1) {
-	def result = doCreateEvent(cmd, item1)
-	for (int i = 0; i < result.size(); i++) {
-		result[i].type = "physical"
-	}
-	result
-}
-
-def createEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelStartLevelChange cmd, Map item1) {
-	[]
-}
-
-def createEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelStopLevelChange cmd, Map item1) {
-	[response(zwave.basicV1.basicGet())]
-}
-
-def createEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelSet cmd, Map item1) {
-	def result = doCreateEvent(cmd, item1)
-	for (int i = 0; i < result.size(); i++) {
-		result[i].type = "physical"
-	}
-	result
-}
-
-def createEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelReport cmd, Map item1) {
-	def result = doCreateEvent(cmd, item1)
-	result[0].descriptionText = "${item1.linkText} is ${item1.value}"
-	result[0].handlerName = cmd.value ? "statusOn" : "statusOff"
-	for (int i = 0; i < result.size(); i++) {
-		result[i].type = "digital"
-	}
-	result
-}
-
-def doCreateEvent(physicalgraph.zwave.Command cmd, Map item1) {
-	def result = [item1]
-
-	item1.name = "switch"
-	item1.value = cmd.value ? "on" : "off"
-	item1.handlerName = item1.value
-	item1.descriptionText = "${item1.linkText} was turned ${item1.value}"
-	item1.canBeCurrentState = true
-	item1.isStateChange = isStateChange(device, item1.name, item1.value)
-	item1.displayed = item1.isStateChange
-
-	if (cmd.value >= 5) {
-		def item2 = new LinkedHashMap(item1)
-		item2.name = "level"
-		item2.value = cmd.value as String
-		item2.unit = "%"
-		item2.descriptionText = "${item1.linkText} dimmed ${item2.value} %"
-		item2.canBeCurrentState = true
-		item2.isStateChange = isStateChange(device, item2.name, item2.value)
-		item2.displayed = false
-		result << item2
-	}
-	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"}
-	[name: "indicatorStatus", value: value, display: false]
+	createEvent([name: "indicatorStatus", value: value])
 }
 
-def createEvent(physicalgraph.zwave.Command cmd,  Map map) {
+def zwaveEvent(physicalgraph.zwave.commands.hailv1.Hail cmd) {
-	// Handles any Z-Wave commands we aren't interested in
+	createEvent([name: "hail", value: "hail", descriptionText: "Switch button was pressed", displayed: false])
-	log.debug "UNHANDLED COMMAND $cmd"
+}
+
+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)
+	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() {
-	log.info "on"
+	delayBetween([
-	delayBetween([zwave.basicV1.basicSet(value: 0xFF).format(), zwave.switchMultilevelV1.switchMultilevelGet().format()], 5000)
+			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)
+	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.min(valueaux, 99)
+	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.min(valueaux, 99)
+	def level = Math.max(Math.min(valueaux, 99), 0)
 	def dimmingDuration = duration < 128 ? duration : 128 + Math.round(duration / 60)
-	zwave.switchMultilevelV2.switchMultilevelSet(value: level, dimmingDuration: dimmingDuration).format()
+	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() {
@@ -197,21 +192,27 @@ def poll() {
 }
 
 def refresh() {
-	zwave.switchMultilevelV1.switchMultilevelGet().format()
+	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 indicatorWhenOn() {
-	sendEvent(name: "indicatorStatus", value: "when on", display: false)
+	sendEvent(name: "indicatorStatus", value: "when on")
 	zwave.configurationV1.configurationSet(configurationValue: [1], parameterNumber: 3, size: 1).format()
 }
 
 def indicatorWhenOff() {
-	sendEvent(name: "indicatorStatus", value: "when off", display: false)
+	sendEvent(name: "indicatorStatus", value: "when off")
 	zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 3, size: 1).format()
 }
 
 def indicatorNever() {
-	sendEvent(name: "indicatorStatus", value: "never", display: false)
+	sendEvent(name: "indicatorStatus", value: "never")
 	zwave.configurationV1.configurationSet(configurationValue: [2], parameterNumber: 3, size: 1).format()
 }
 
@@ -222,4 +223,4 @@ def invertSwitch(invert=true) {
 	else {
 		zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 4, size: 1).format()
 	}
-}
+}

smartapps/varma/auto-lock.src/auto-lock.groovy

@@ -0,0 +1,168 @@
+/**
+ *  Auto Lock
+ *
+ *  Copyright 2015 Vikash Varma
+ *
+ *  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.
+ *  
+ */
+
+// Automatically generated. Make future change here.
+definition(
+    name: "Auto Lock",
+ 	namespace: "varma",
+    author: "Vikash Varma",
+    description: "Manage authorized users and send notification when lock is unlocked. Automatically lock it based on elapsed time or no motion detected near the lock",
+    category: "Safety & Security",
+    iconUrl: "http://ecx.images-amazon.com/images/I/51lIeDU229L._SL1500_.jpg",
+    iconX2Url: "http://ecx.images-amazon.com/images/I/51lIeDU229L._SL1500_.jpg",
+    oauth: true
+)
+import groovy.json.JsonSlurper
+
+preferences {
+	page (name: "mainPage", title: "Automatically locks a deadbolt or lever lock using motion sensor or time elapsed", nextPage: "page2", uninstall: true) {
+    	section {
+			input "lockDevice", "capability.lock", title:"Which Lock?"
+        	input "lockOpt", "enum", title: "Preference", metadata: [values: ["Motion", "Time"]], multiple:false  
+            input "maxusers", "number", title: "Maximum authorized users", required:true
+            input "pushNotify", "boolean" , title:"Send push notification when unlocked", default: true
+		}
+    }
+     
+	page (name: "page2", nextPage: "adduser",  title: "Automatically locks a deadbolt or lever lock using motion sensor or time elapsed", install: true, uninstall: true)
+}
+def page2() {
+    dynamicPage(name: "page2") {
+    	section("Set $lockOpt Preference") {
+    		if (lockOpt == "Motion" ) {  		
+				input "motion1", "capability.motionSensor", title:"Lock door after no motion"			
+       		} else {
+				input "minutesLater", "number", title: "Lock door after how many minutes?"
+        	}
+        }
+        
+        for (int i = 1; i <= settings.maxusers; i++) {
+    		section("Add User #${i}") {        	
+        		input "user${i}", "string", title: "Username", required:true
+        		input "code${i}", "password", title: "Code", required:true
+    		}
+        }
+    }
+}
+
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+	unsubscribe()
+	initialize()
+}
+
+def initialize() {	
+    state.lockStatus = 1 // 0 = locked; 1 = unlocked
+    subscribe(lockDevice, "lock.locked", lockEvent)
+    if (lockOpt == 'Time') {
+    	subscribe(lockDevice, "lock.unlocked", unlockEvent)
+    } else {
+    	subscribe(motion1, "motion", motionHandler)
+    }
+    
+    deleteLockCode()   
+    state.maxusers = 0
+    for (int i=0; i< settings.maxusers; i++) {
+    	runIn(i*180, setLockCode, [overwrite: false])
+    }
+}
+
+
+def setLockCode() {
+	log.trace "setLockCode start: state.maxuser=$state.maxusers"
+    if (state.maxusers < settings.maxusers ) {
+    	state.maxusers = state.maxusers + 1 
+		def lockCode = settings."code${state.maxusers}"
+    	lockCode = lockCode +""
+		def msg = "$lockDevice added user $state.maxusers, code: $lockCode"
+    	log.info msg
+    	lockDevice.setCode(state.maxusers, lockCode)
+    } else {
+    	log.debug "end scheduling,state.maxuser=$state.maxusers, settings.maxusers=$settings.maxusers"
+    }
+    log.trace "setLockCode end: state.maxuser=$state.maxusers"
+}
+
+def unlockEvent(evt) {
+	log.debug "Lock ${lockDevice} was: ${evt.value}"
+	state.lockStatus = 1
+    def delay = minutesLater * 60 
+    log.debug "Locking $lockDevice.displayName in ${minutesLater} minutes"
+    runIn(delay, lockDoor)
+          
+    def data = []
+    def unlockmsg = ""
+    if (evt.data != null) {
+		data = new JsonSlurper().parseText(evt.data)
+        if (data.usedCode <= settings.maxusers) {
+        	def u = settings."user${data.usedCode}"
+        	unlockmsg = "$lockDevice was unlocked by $u"
+        } else {
+        	unlockmsg = "$lockDevice was unlocked by unknown user"
+        }
+    } else {
+    	unlockmsg = "$lockDevice was unlocked by app"
+        
+    }
+    log.debug "pushNotify=$pushNotify | unlockmsg=$unlockmsg"
+    if (pushNotify) {
+        sendPush(unlockmsg);
+    }  else {
+    	log.debug "noPush"
+    
+    }
+}
+
+def lockEvent(evt) {
+	state.lockStatus = 0
+    log.debug "$lockDevice.displayName is locked"
+    unschedule( lockDoor ) 
+}
+
+
+def motionHandler(evt) {
+	if (evt.value == "inactive") {
+		lockDoor(evt)
+	} 
+}
+
+def lockDoor(evt) {
+	if ( state.lockStatus ) {
+ 	    sendPush("$app.name is locking $lockDevice.displayName")
+ 		lockDevice.lock()
+        state.lockStatus = 0
+    } else {
+    	log.debug "$lolockDeviceck1.displayName already locked"
+    }
+}
+
+def deleteLockCode() {
+	log.debug "in deleteLockCode"
+	for (int i = settings.maxusers + 1 ; i <= state.maxusers; i++)  {
+    	lockDevice.deleteCode(i)
+        log.debug "Deleting code $i"
+    }
+}
+
+def checkCodeSetup() {
+
+}