DHF-7 Z-Wave Lock: Add scheduled checks in case ping() is missed

NVS-6

devicetypes/erocm123/inovelli-2-channel-smart-plug.src/inovelli-2-channel-smart-plug.groovy

@@ -1,266 +0,0 @@
-/**
- *
- *  Inovelli 2-Channel Smart Plug
- *
- *  github: Eric Maycock (erocm123)
- *  Date: 2017-04-27
- *  Copyright Eric Maycock
- *
- *  Includes all configuration parameters and ease of advanced configuration.
- *
- *  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: "Inovelli 2-Channel Smart Plug", namespace: "erocm123", author: "Eric Maycock") {
-		capability "Actuator"
-		capability "Sensor"
-		capability "Switch"
-		capability "Polling"
-		capability "Refresh"
-		capability "Health Check"
-		fingerprint manufacturer: "015D", prod: "0221", model: "251C"
-	}
-	simulator {}
-	preferences {}
-	tiles {
-		multiAttributeTile(name: "switch", type: "lighting", width: 6, height: 4, canChangeIcon: true) {
-			tileAttribute("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
-				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00a0dc", nextState: "turningOff"
-				attributeState "turningOff", 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: "#00a0dc", nextState: "turningOff"
-			}
-		}
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label: "", action: "refresh.refresh", icon: "st.secondary.refresh"
-		}
-		main(["switch"])
-		details(["switch",
-				 childDeviceTiles("all"), "refresh"
-		])
-	}
-}
-def parse(String description) {
-	def result = []
-	def cmd = zwave.parse(description)
-	if (cmd) {
-		result += zwaveEvent(cmd)
-		logging("Parsed ${cmd} to ${result.inspect()}", 1)
-	} else {
-		logging("Non-parsed event: ${description}", 2)
-	}
-	return result
-}
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd, ep = null) {
-	logging("BasicReport ${cmd} - ep ${ep}", 2)
-	if (ep) {
-		def event
-		childDevices.each {
-			childDevice ->
-				if (childDevice.deviceNetworkId == "$device.deviceNetworkId-ep$ep") {
-					childDevice.sendEvent(name: "switch", value: cmd.value ? "on" : "off")
-				}
-		}
-		if (cmd.value) {
-			event = [createEvent([name: "switch", value: "on"])]
-		} else {
-			def allOff = true
-			childDevices.each {
-				n ->
-					if (n.currentState("switch").value != "off") allOff = false
-			}
-			if (allOff) {
-				event = [createEvent([name: "switch", value: "off"])]
-			} else {
-				event = [createEvent([name: "switch", value: "on"])]
-			}
-		}
-		return event
-	}
-}
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
-	logging("BasicSet ${cmd}", 2)
-	def result = createEvent(name: "switch", value: cmd.value ? "on" : "off", type: "digital")
-	def cmds = []
-	cmds << encap(zwave.switchBinaryV1.switchBinaryGet(), 1)
-	cmds << encap(zwave.switchBinaryV1.switchBinaryGet(), 2)
-	return [result, response(commands(cmds))] // returns the result of reponse()
-}
-def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd, ep = null) {
-	logging("SwitchBinaryReport ${cmd} - ep ${ep}", 2)
-	if (ep) {
-		def event
-		def childDevice = childDevices.find {
-			it.deviceNetworkId == "$device.deviceNetworkId-ep$ep"
-		}
-		if (childDevice) childDevice.sendEvent(name: "switch", value: cmd.value ? "on" : "off")
-		if (cmd.value) {
-			event = [createEvent([name: "switch", value: "on"])]
-		} else {
-			def allOff = true
-			childDevices.each {
-				n->
-					if (n.currentState("switch").value != "off") allOff = false
-			}
-			if (allOff) {
-				event = [createEvent([name: "switch", value: "off"])]
-			} else {
-				event = [createEvent([name: "switch", value: "on"])]
-			}
-		}
-		return event
-	} else {
-		def result = createEvent(name: "switch", value: cmd.value ? "on" : "off", type: "digital")
-		def cmds = []
-		cmds << encap(zwave.switchBinaryV1.switchBinaryGet(), 1)
-		cmds << encap(zwave.switchBinaryV1.switchBinaryGet(), 2)
-		return [result, response(commands(cmds))] // returns the result of reponse()
-	}
-}
-def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiChannelCmdEncap cmd) {
-	logging("MultiChannelCmdEncap ${cmd}", 2)
-	def encapsulatedCommand = cmd.encapsulatedCommand([0x32: 3, 0x25: 1, 0x20: 1])
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand, cmd.sourceEndPoint as Integer)
-	}
-}
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
-	logging("ManufacturerSpecificReport ${cmd}", 2)
-	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
-	logging("msr: $msr", 2)
-	updateDataValue("MSR", msr)
-}
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	// This will capture any commands not handled by other instances of zwaveEvent
-	// and is recommended for development so you can see every command the device sends
-	logging("Unhandled Event: ${cmd}", 2)
-}
-def on() {
-	logging("on()", 1)
-	commands([
-			zwave.switchAllV1.switchAllOn(),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 1),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 2)
-	])
-}
-def off() {
-	logging("off()", 1)
-	commands([
-			zwave.switchAllV1.switchAllOff(),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 1),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 2)
-	])
-}
-void childOn(String dni) {
-	logging("childOn($dni)", 1)
-	def cmds = []
-	cmds << new physicalgraph.device.HubAction(command(encap(zwave.basicV1.basicSet(value: 0xFF), channelNumber(dni))))
-	cmds << new physicalgraph.device.HubAction(command(encap(zwave.switchBinaryV1.switchBinaryGet(), channelNumber(dni))))
-	sendHubCommand(cmds, 1000)
-}
-void childOff(String dni) {
-	logging("childOff($dni)", 1)
-	def cmds = []
-	cmds << new physicalgraph.device.HubAction(command(encap(zwave.basicV1.basicSet(value: 0x00), channelNumber(dni))))
-	cmds << new physicalgraph.device.HubAction(command(encap(zwave.switchBinaryV1.switchBinaryGet(), channelNumber(dni))))
-	sendHubCommand(cmds, 1000)
-}
-void childRefresh(String dni) {
-	logging("childRefresh($dni)", 1)
-	def cmds = []
-	cmds << new physicalgraph.device.HubAction(command(encap(zwave.switchBinaryV1.switchBinaryGet(), channelNumber(dni))))
-	sendHubCommand(cmds, 1000)
-}
-def poll() {
-	logging("poll()", 1)
-	commands([
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 1),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 2),
-	])
-}
-def refresh() {
-	logging("refresh()", 1)
-	commands([
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 1),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 2),
-	])
-}
-def ping() {
-	logging("ping()", 1)
-	refresh()
-}
-def installed() {
-	logging("installed()", 1)
-	command(zwave.manufacturerSpecificV1.manufacturerSpecificGet())
-	createChildDevices()
-}
-def updated() {
-	logging("updated()", 1)
-	if (!childDevices) {
-		createChildDevices()
-	} else if (device.label != state.oldLabel) {
-		childDevices.each {
-			if (it.label == "${state.oldLabel} (CH${channelNumber(it.deviceNetworkId)})") {
-				def newLabel = "${device.displayName} (CH${channelNumber(it.deviceNetworkId)})"
-				it.setLabel(newLabel)
-			}
-		}
-		state.oldLabel = device.label
-	}
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-	sendEvent(name: "needUpdate", value: device.currentValue("needUpdate"), displayed: false, isStateChange: true)
-}
-def zwaveEvent(physicalgraph.zwave.commands.configurationv2.ConfigurationReport cmd) {
-	logging("${device.displayName} parameter '${cmd.parameterNumber}' with a byte size of '${cmd.size}' is set to '${cmd2Integer(cmd.configurationValue)}'", 2)
-}
-private encap(cmd, endpoint) {
-	if (endpoint) {
-		zwave.multiChannelV3.multiChannelCmdEncap(destinationEndPoint: endpoint).encapsulate(cmd)
-	} else {
-		cmd
-	}
-}
-private command(physicalgraph.zwave.Command cmd) {
-	if (state.sec) {
-		zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
-	} else {
-		cmd.format()
-	}
-}
-private commands(commands, delay = 1000) {
-	delayBetween(commands.collect {
-		command(it)
-	}, delay)
-}
-private channelNumber(String dni) {
-	dni.split("-ep")[-1] as Integer
-}
-private void createChildDevices() {
-	state.oldLabel = device.label
-	for (i in 1..2) {
-		addChildDevice("Switch Child Device", "${device.deviceNetworkId}-ep${i}", null, [completedSetup: true, label: "${device.displayName} (CH${i})",
-																						 isComponent: true, componentName: "ep$i", componentLabel: "Channel $i"
-		])
-	}
-}
-
-private def logging(message, level) {
-	if (logLevel != "0") {
-		switch (logLevel) {
-			case "1":
-				if (level > 1) log.debug "$message"
-				break
-			case "99":
-				log.debug "$message"
-				break
-		}
-	}
-}

devicetypes/erocm123/switch-child-device.src/switch-child-device.groovy

@@ -1,49 +0,0 @@
-/**
- *  Switch Child Device
- *
- *  Copyright 2017 Eric Maycock
- *
- *  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: "Switch Child Device", namespace: "erocm123", author: "Eric Maycock") {
-		capability "Switch"
-		capability "Actuator"
-		capability "Sensor"
-		capability "Refresh"
-	}
-
-	tiles {
-		multiAttributeTile(name:"switch", type: "lighting", width: 3, height: 4, canChangeIcon: true){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState:"turningOn"
-				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC", nextState:"turningOff"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
-				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-			}
-		}
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-	}
-}
-
-void on() {
-	parent.childOn(device.deviceNetworkId)
-}
-
-void off() {
-	parent.childOff(device.deviceNetworkId)
-}
-
-void refresh() {
-	parent.childRefresh(device.deviceNetworkId)
-}

devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy

@@ -25,6 +25,9 @@ metadata {
 		capability "Health Check"
 
 		fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x20, 0x86, 0x72, 0x5A, 0x59, 0x85, 0x73, 0x84, 0x80, 0x71, 0x56, 0x70, 0x31, 0x8E, 0x22, 0x30, 0x9C, 0x98, 0x7A", outClusters: ""
+
+		fingerprint mfr:"010F", prod:"0801", model:"2001"
+		fingerprint mfr:"010F", prod:"0801", model:"1001"
 	}
 
 	simulator {

devicetypes/smartthings/aeon-siren.src/aeon-siren.groovy

@@ -16,7 +16,7 @@
  *	Date: 2014-07-15
  */
 metadata {
- definition (name: "Aeon Siren", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.smoke") {
+ definition (name: "Aeon Siren", namespace: "smartthings", author: "SmartThings") {
 	capability "Actuator"
 	capability "Alarm"
 	capability "Switch"

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

@@ -47,14 +47,14 @@
 		capability 	"Sensor"
 		capability 	"Battery"
 		capability  "Health Check"
-
 		command "resetParams2StDefaults"
 		command "listCurrentParams"
 		command "updateZwaveParam"
 		command "test"
 		command "configure"
 
-		fingerprint deviceId: "0x2001", inClusters: "0x30,0x84,0x85,0x80,0x8F,0x56,0x72,0x86,0x70,0x8E,0x31,0x9C,0xEF,0x30,0x31,0x9C"
+		fingerprint mfr:"010F", prod:"0800", model:"2001"
+		fingerprint mfr:"010F", prod:"0800", model:"1001"
 	}
 
 	simulator {

devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy

@@ -29,7 +29,6 @@ metadata {
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200-Sgb", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-RZHAC", deviceJoinName: "Outlet"
-		fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 000F, 0B04", outClusters: "0019", manufacturer: "SmartThings", model: "outletv4", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019"
 	}
 

devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy

@@ -27,6 +27,7 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "0003, 000A, 0019", manufacturer: "Jasco Products", model: "45853", deviceJoinName: "GE ZigBee Plug-In Switch"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45856", deviceJoinName: "GE ZigBee In-Wall Switch"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 000F, 0B04", outClusters: "0019", manufacturer: "SmartThings", model: "outletv4", deviceJoinName: "Outlet"
     }
 
     tiles(scale: 2) {

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

@@ -152,6 +152,10 @@ def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupported
 
 def zwaveEvent(DoorLockOperationReport cmd) {
 	def result = []
+
+	unschedule(followupStateCheck)
+	unschedule(stateCheck)
+
 	def map = [ name: "lock" ]
 	if (cmd.doorLockMode == 0xFF) {
 		map.value = "locked"
@@ -365,7 +369,7 @@ def zwaveEvent(UserCodeReport cmd) {
 			code = state["set$name"] ?: decrypt(state[name]) ?: "****"
 			state.remove("set$name".toString())
 		} else {
-			map = [ name: "codeReport", value: cmd.userIdentifier, data: [ code: code ] ]
+			map = [ name: "codeReport", value: cmd.userIdentifier, data: [ code: code ], isStateChange: true ]
 			map.descriptionText = "$device.displayName code $cmd.userIdentifier is set"
 			map.displayed = (cmd.userIdentifier != state.requestCode && cmd.userIdentifier != state.pollCode)
 			map.isStateChange = true
@@ -456,11 +460,12 @@ def zwaveEvent(physicalgraph.zwave.commands.timev1.TimeGet cmd) {
 def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
 	// The old Schlage locks use group 1 for basic control - we don't want that, so unsubscribe from group 1
 	def result = [ createEvent(name: "lock", value: cmd.value ? "unlocked" : "locked") ]
-	result << response(zwave.associationV1.associationRemove(groupingIdentifier:1, nodeId:zwaveHubNodeId))
+	def cmds = [
-	if (state.assoc != zwaveHubNodeId) {
+			zwave.associationV1.associationRemove(groupingIdentifier:1, nodeId:zwaveHubNodeId).format(),
-		result << response(zwave.associationV1.associationGet(groupingIdentifier:2))
+			"delay 1200",
-	}
+			zwave.associationV1.associationGet(groupingIdentifier:2).format()
-	result
+		]
+	[result, response(cmds)]
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
@@ -530,11 +535,18 @@ def unlockwtimeout() {
 	lockAndCheck(DoorLockOperationSet.DOOR_LOCK_MODE_DOOR_UNSECURED_WITH_TIMEOUT)
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
 def ping() {
-	refresh()
+	runIn(30, followupStateCheck)
+	secure(zwave.doorLockV1.doorLockOperationGet())
+}
+
+def followupStateCheck() {
+	runEvery1Hour(stateCheck)
+	stateCheck()
+}
+
+def stateCheck() {
+	sendHubCommand(new physicalgraph.device.HubAction(secure(zwave.doorLockV1.doorLockOperationGet())))
 }
 
 def refresh() {