MSA-2127: Fibaro Door/ Window 2 is a new contact sensor that was released in Europe in June 2017 and will be released in the USA on August 1st.

D/W 2 has integrated temperature sensor and we revised how parameters are adjusted.

devicetypes/fibargroup/fibaro-door-window-sensor-2.src/fibaro-door-window-sensor-2.groovy

@@ -0,0 +1,462 @@
+/**
+ *  Fibaro Door/Window Sensor 2
+ *
+ *  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: "Fibaro Door/Window Sensor 2", namespace: "Fibargroup", author: "Fibar Group S.A.") {	
+		capability "Contact Sensor"
+		capability "Tamper Alert"
+		capability "Temperature Measurement"
+		capability "Configuration"
+		capability "Battery"
+		capability "Sensor"
+		capability "Health Check"
+	
+		attribute "temperatureAlarm", "string"
+	
+		fingerprint mfr: "010F", prod: "0702"
+		fingerprint deviceId: "0x0701", inClusters:"0x5E,0x59,0x22,0x80,0x56,0x7A,0x73,0x98,0x31,0x85,0x70,0x5A,0x72,0x8E,0x71,0x86,0x84"
+		fingerprint deviceId: "0x0701", inClusters:"0x5E,0x59,0x22,0x80,0x56,0x7A,0x73,0x31,0x85,0x70,0x5A,0x72,0x8E,0x71,0x86,0x84"
+	}
+
+	tiles (scale: 2) {
+		multiAttributeTile(name:"FGDW", type:"lighting", width:6, height:4) {
+			tileAttribute("device.contact", key:"PRIMARY_CONTROL") {
+				attributeState("open", label:"open", icon:"st.contact.contact.open", backgroundColor:"#e86d13")
+				attributeState("closed", label:"closed", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc")
+			}
+			tileAttribute("device.multiStatus", key:"SECONDARY_CONTROL") {
+				attributeState("multiStatus", label:'${currentValue}')
+			}
+		}
+		
+		valueTile("tamper", "device.tamper", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
+			state "tamper", label:'Tamper:\n ${currentValue}'
+		}
+		
+		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
+			state "temperature", label:'${currentValue}°',
+			backgroundColors:[
+				[value: 31, color: "#153591"],
+				[value: 44, color: "#1e9cbb"],
+				[value: 59, color: "#90d2a7"],
+				[value: 74, color: "#44b621"],
+				[value: 84, color: "#f1d801"],
+				[value: 95, color: "#d04e00"],
+				[value: 96, color: "#bc2323"]
+			]
+		}
+		
+		valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
+			state "battery", label:'${currentValue}%\n battery', unit:"%"
+		}	
+		
+		standardTile("temperatureAlarm", "device.temperatureAlarm", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
+			state "default", label: "No temp. alarm", backgroundColor:"#ffffff"
+			state "clear", label:'', backgroundColor:"#ffffff", icon: "st.alarm.temperature.normal"
+			state "underheat", label:'underheat', backgroundColor:"#1e9cbb", icon: "st.alarm.temperature.freeze"
+			state "overheat", label:'overheat', backgroundColor:"#d04e00", icon: "st.alarm.temperature.overheat"
+		}
+
+		main "FGDW"
+		details(["FGDW","tamper","temperature","battery","temperatureAlarm"])
+	}
+		
+	preferences {
+		
+ 		input (
+			title: "Fibaro Door/Window Sensor 2",
+			description: "Tap to view the manual.",
+			image: "http://manuals.fibaro.com/wp-content/uploads/2017/05/dws2.jpg",
+			url: "http://manuals.fibaro.com/content/manuals/en/FGDW-002/FGDW-002-EN-T-v1.0.pdf",
+			type: "href",
+			element: "href"
+		)
+		
+		input (
+			title: "Wake up interval",
+			description: "How often should your device automatically sync with the HUB. The lower the value, the shorter the battery life.\n0 or 1-18 (in hours)",
+			type: "paragraph",
+			element: "paragraph"
+		)
+		
+		input ( 
+			name: "wakeUpInterval", 
+			title: null, 
+			type: "number", 
+			range: "0..18", 
+			defaultValue: 6, 
+			required: false 
+		)
+		
+		parameterMap().findAll{(it.num as Integer) != 54}.each {
+			input (
+				title: "${it.num}. ${it.title}",
+				description: it.descr,
+				type: "paragraph",
+				element: "paragraph"
+			)
+			
+			input (
+				name: it.key,
+				title: null,
+				description: "Default: $it.def" ,
+				type: it.type,
+				options: it.options,
+				range: (it.min != null && it.max != null) ? "${it.min}..${it.max}" : null,
+				defaultValue: it.def,
+				required: false
+			)
+		}
+		
+		input ( name: "logging", title: "Logging", type: "boolean", required: false )
+	}
+}
+
+def updated() {
+	if ( state.lastUpdated && (now() - state.lastUpdated) < 500 ) return
+	logging("${device.displayName} - Executing updated()","info")
+
+	if ( settings.temperatureHigh as Integer == 0 && settings.temperatureLow as Integer == 0 ) { 
+		sendEvent(name: "temperatureAlarm", value: null, displayed: false) 
+	} else if ( settings.temperatureHigh != null || settings.temperatureHigh != null ) {
+		sendEvent(name: "temperatureAlarm", value: "clear", displayed: false) 
+	}
+	
+	syncStart()
+	state.lastUpdated = now()
+}
+
+def configure() {
+	def cmds = []
+	cmds << zwave.batteryV1.batteryGet()
+	cmds << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1)
+	encapSequence(cmds,1000)
+}
+
+private syncStart() {
+	boolean syncNeeded = false
+	Integer settingValue = null
+	parameterMap().each {
+		if(settings."$it.key" != null || it.num == 54) {
+			if (state."$it.key" == null) { state."$it.key" = [value: null, state: "synced"] } 
+			if ( (it.num as Integer) == 54 ) { 
+				settingValue = (((settings."temperatureHigh" as Integer) == 0) ? 0 : 1) + (((settings."temperatureLow" as Integer) == 0) ? 0 : 2)
+			} else if ( (it.num as Integer) in [55,56] ) { 
+				settingValue = (((settings."$it.key" as Integer) == 0) ? state."$it.key".value : settings."$it.key") as Integer
+			} else {
+				settingValue = settings."$it.key" as Integer
+			}
+			if (state."$it.key".value != settingValue || state."$it.key".state != "synced" ) {
+				state."$it.key".value = settingValue
+				state."$it.key".state = "notSynced"
+				syncNeeded = true
+			}
+		}
+	}
+	
+	if(settings.wakeUpInterval != null) {
+		if (state.wakeUpInterval == null) { state.wakeUpInterval = [value: null, state: "synced"] } 
+		if (state.wakeUpInterval.value != ((settings.wakeUpInterval as Integer) * 3600)) { 
+			sendEvent(name: "checkInterval", value: (settings.wakeUpInterval as Integer) * 3600 * 4 + 120, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+			state.wakeUpInterval.value = ((settings.wakeUpInterval as Integer) * 3600)
+			state.wakeUpInterval.state = "notSynced"
+			syncNeeded = true
+		}
+	} else {
+		sendEvent(name: "checkInterval", value: 21600 * 4 + 120, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	}
+	
+	if ( syncNeeded ) { 
+		logging("${device.displayName} - sync needed.", "info")
+		multiStatusEvent("Sync pending. Please wake up the device by pressing the tamper button.", true)
+	}
+}
+
+private syncNext() {
+	logging("${device.displayName} - Executing syncNext()","info")
+	def cmds = []
+	for ( param in parameterMap() ) {
+		if ( state."$param.key"?.value != null && state."$param.key"?.state in ["notSynced","inProgress"] ) {
+			multiStatusEvent("Sync in progress. (param: ${param.num})", true)
+			state."$param.key"?.state = "inProgress"
+			cmds << response(encap(zwave.configurationV2.configurationSet(configurationValue: intToParam(state."$param.key".value, param.size), parameterNumber: param.num, size: param.size)))
+			cmds << response(encap(zwave.configurationV2.configurationGet(parameterNumber: param.num)))
+			break
+		} 
+	}
+	if (cmds) { 
+		runIn(10, "syncCheck")
+		sendHubCommand(cmds,1000)
+	} else {
+		runIn(1, "syncCheck")
+	}
+}
+
+private syncCheck() {
+	logging("${device.displayName} - Executing syncCheck()","info")
+	def failed = []
+	def incorrect = []
+	def notSynced = []
+	parameterMap().each {
+		if (state."$it.key"?.state == "incorrect" ) {
+			incorrect << it
+		} else if ( state."$it.key"?.state == "failed" ) {
+			failed << it
+		} else if ( state."$it.key"?.state in ["inProgress","notSynced"] ) {
+			notSynced << it
+		}
+	}
+	
+	if (failed) {
+		multiStatusEvent("Sync failed! Verify parameter: ${failed[0].num}", true, true)
+	} else if (incorrect) {
+		multiStatusEvent("Sync mismatch! Verify parameter: ${incorrect[0].num}", true, true)
+	} else if (notSynced) {
+		multiStatusEvent("Sync incomplete! Wake up the device again by pressing the tamper button.", true, true)
+	} else {
+		sendHubCommand(response(encap(zwave.wakeUpV1.wakeUpNoMoreInformation())))
+		if (device.currentValue("multiStatus")?.contains("Sync")) { multiStatusEvent("Sync OK.", true, true) }
+	}
+}
+
+private multiStatusEvent(String statusValue, boolean force = false, boolean display = false) {
+	if (!device.currentValue("multiStatus")?.contains("Sync") || device.currentValue("multiStatus") == "Sync OK." || force) {
+		sendEvent(name: "multiStatus", value: statusValue, descriptionText: statusValue, displayed: display)
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
+	logging("${device.displayName} woke up", "info")
+	def cmds = []
+	sendEvent(descriptionText: "$device.displayName woke up", isStateChange: true)
+	if ( state.wakeUpInterval?.state == "notSynced" && state.wakeUpInterval?.value != null ) {
+		cmds << zwave.wakeUpV2.wakeUpIntervalSet(seconds: state.wakeUpInterval.value as Integer, nodeid: zwaveHubNodeId)
+		state.wakeUpInterval.state = "synced"
+	}
+	cmds << zwave.batteryV1.batteryGet()
+	cmds << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1)
+	runIn(1,"syncNext")
+	[response(encapSequence(cmds,1000))]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.configurationv2.ConfigurationReport cmd) {
+	def paramKey = parameterMap().find( {it.num == cmd.parameterNumber } ).key
+	logging("${device.displayName} - Parameter ${paramKey} value is ${cmd.scaledConfigurationValue} expected " + state."$paramKey".value, "info")
+	state."$paramKey".state = (state."$paramKey".value == cmd.scaledConfigurationValue) ? "synced" : "incorrect"
+	syncNext()
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.applicationstatusv1.ApplicationRejectedRequest cmd) {
+	logging("${device.displayName} - rejected request!","warn")
+	for ( param in parameterMap() ) {
+		if ( state."$param.key"?.state == "inProgress" ) {
+			state."$param.key"?.state = "failed"
+			break
+		} 
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd) {
+	logging("${device.displayName} - AlarmReport received, zwaveAlarmType: ${cmd.zwaveAlarmType}, zwaveAlarmEvent: ${cmd.zwaveAlarmEvent}", "info")
+	def lastTime = new Date().format("yyyy MMM dd EEE h:mm:ss a", location.timeZone)
+	switch (cmd.zwaveAlarmType) {
+		case 6: 
+			sendEvent(name: "contact", value: (cmd.zwaveAlarmEvent == 22)? "open":"closed"); 
+			if (cmd.zwaveAlarmEvent == 22) { multiStatusEvent("Contact Open - $lastTime") }
+			break;
+		case 7: 
+			sendEvent(name: "tamper", value: (cmd.zwaveAlarmEvent == 3)? "detected":"clear"); 
+			if (cmd.zwaveAlarmEvent == 3) { multiStatusEvent("Tamper - $lastTime") }
+			break;
+		case 4:
+			if (device.currentValue("temperatureAlarm")?.value != null) {
+				switch (cmd.zwaveAlarmEvent) {
+					case 0: sendEvent(name: "temperatureAlarm", value: "clear"); break;
+					case 2: sendEvent(name: "temperatureAlarm", value: "overheat"); break;
+					case 6: sendEvent(name: "temperatureAlarm", value: "underheat"); break;
+				}; 
+			};
+			break;
+		default: logging("${device.displayName} - Unknown zwaveAlarmType: ${cmd.zwaveAlarmType}","warn");
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd) {
+	logging("${device.displayName} - SensorMultilevelReport received, sensorType: ${cmd.sensorType}, scaledSensorValue: ${cmd.scaledSensorValue}", "info")
+	switch (cmd.sensorType) {
+		case 1:
+			def cmdScale = cmd.scale == 1 ? "F" : "C"
+			sendEvent(name: "temperature", unit: getTemperatureScale(), value: convertTemperatureIfNeeded(cmd.scaledSensorValue, cmdScale, cmd.precision), displayed: true)
+			break
+		default: 
+			logging("${device.displayName} - Unknown sensorType: ${cmd.sensorType}","warn")
+			break
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
+	logging("${device.displayName} - BatteryReport received, value: ${cmd.batteryLevel}", "info")
+	sendEvent(name: "battery", value: cmd.batteryLevel.toString(), unit: "%", displayed: true)
+}
+
+def parse(String description) {
+	def result = []
+	logging("${device.displayName} - Parsing: ${description}")
+	if (description.startsWith("Err 106")) {
+		result = createEvent(
+			descriptionText: "Failed to complete the network security key exchange. If you are unable to receive data from it, you must remove it from your network and add it again.",
+			eventType: "ALERT",
+			name: "secureInclusion",
+			value: "failed",
+			displayed: true,
+		)
+	} else if (description == "updated") {
+		return null
+	} else {
+		def cmd = zwave.parse(description, cmdVersions()) 
+		if (cmd) {
+			logging("${device.displayName} - Parsed: ${cmd}")
+			zwaveEvent(cmd)
+		}
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
+	def encapsulatedCommand = cmd.encapsulatedCommand(cmdVersions()) 
+	if (encapsulatedCommand) {
+		logging("${device.displayName} - Parsed SecurityMessageEncapsulation into: ${encapsulatedCommand}")
+		zwaveEvent(encapsulatedCommand)
+	} else {
+		log.warn "Unable to extract secure cmd from $cmd"
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
+	def version = cmdVersions()[cmd.commandClass as Integer]
+	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
+	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
+	if (encapsulatedCommand) {
+		logging("${device.displayName} - Parsed Crc16Encap into: ${encapsulatedCommand}")
+		zwaveEvent(encapsulatedCommand)
+	} else {
+		log.warn "Could not extract crc16 command from $cmd"
+	}
+}
+
+private logging(text, type = "debug") {
+	if (settings.logging == "true") {
+		log."$type" text
+	}
+}
+
+private secEncap(physicalgraph.zwave.Command cmd) {
+	logging("${device.displayName} - encapsulating command using Secure Encapsulation, command: $cmd","info")
+	zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
+}
+
+private crcEncap(physicalgraph.zwave.Command cmd) {
+	logging("${device.displayName} - encapsulating command using CRC16 Encapsulation, command: $cmd","info")
+	zwave.crc16EncapV1.crc16Encap().encapsulate(cmd).format() 
+}
+
+private encap(physicalgraph.zwave.Command cmd) {
+	if (zwaveInfo.zw.contains("s")) { 
+		secEncap(cmd)
+	} else if (zwaveInfo.cc.contains("56")){ 
+		crcEncap(cmd)
+	} else {
+		logging("${device.displayName} - no encapsulation supported for command: $cmd","info")
+		cmd.format()
+	}
+}
+
+private encapSequence(cmds, Integer delay=250) {
+	delayBetween(cmds.collect{ encap(it) }, delay)
+}
+
+private List intToParam(Long value, Integer size = 1) {
+	def result = []
+	size.times { 
+		result = result.plus(0, (value & 0xFF) as Short)
+		value = (value >> 8)
+	}
+	return result
+}
+
+private Map cmdVersions() {
+	[0x5E: 2, 0x59: 1, 0x22: 1, 0x80: 1, 0x56: 1, 0x7A: 3, 0x73: 1, 0x98: 1, 0x31: 5, 0x85: 2, 0x70: 2, 0x5A: 1, 0x72: 2, 0x8E: 2, 0x71: 2, 0x86: 1, 0x84: 2]
+}
+
+private parameterMap() {[
+	[key: "doorState", num: 1, size: 1, type: "enum", options: [0: "Closed when magnet near", 1: "Opened when magnet near"], def: "0", title: "Door/window state", 
+		descr: "Defines the state of door/window depending on the magnet position."],
+	[key: "ledIndications", num: 2, size: 1, type: "enum", options: [
+		1: "Indication of opening/closing",
+		2: "Indication of wake up",
+		4: "Indication of device tampering",
+		6: "Indication of wake up & tampering",
+		], 
+		def: "6", title: "Visual LED indications", 
+		descr: "Defines events indicated by the visual LED indicator. Disabling events might extend battery life."],
+	[key: "tamperDelay", num: 30, size: 2, type: "number", def: 5, min: 0, max: 32400, title: "Tamper - alarm cancellation delay", 
+		descr: "Time period after which a tamper alarm will be cancelled.\n0-32400 - time in seconds"], 
+	[key: "tamperCancelation", num: 31, size: 1, type: "enum", options: [0: "Do not send tamper cancellation report", 1: "Send tamper cancellation report"], def: "1", title: "Tamper – reporting alarm cancellation", 
+		descr: "Reporting cancellation of tamper alarm to the controller and 3rd association group."],
+	[key: "temperatureMeasurement", num: 50, size: 2, type: "number", def: 300, min: 0, max: 32400, title: "Interval of temperature measurements", 
+		descr: "This parameter defines how often the temperature will be measured (specific time).\n0 - temperature measurements disabled\n5-32400 - time in seconds"], 
+	[key: "temperatureThreshold", num: 51, size: 2, type: "enum", options: [
+		0: "disabled", 
+		3: "0.5°F/0.3°C", 
+		6: "1°F/0.6°C",
+		11: "2°F/1.1°C",
+		17: "3°F/1.7°C",
+		22: "4°F/2.2°C",
+		28: "5°F/2.8°C"],
+		def: 11, title: "Temperature reports threshold", 
+		descr: "Change of temperature resulting in temperature report being sent to the HUB."],
+	[key: "temperatureAlarm", num: 54, size: 1, type: "enum", options: [
+		0: "Temperature alarms disabled", 
+		1: "High temperature alarm",
+		2: "Low temperature alarm",
+		3: "High and low temperature alarms"], 
+		def: "0", title: "Temperature alarm reports", 
+		descr: "Temperature alarms reported to the Z-Wave controller. Thresholds are set in parameters 55 and 56"],
+	[key: "temperatureHigh", num: 55, size: 2, type: "enum", options: [
+		0: "disabled",
+		200: "68°F/20°C",
+		250: "77°F/25°C",
+		300: "86°F/30°C",
+		350: "95°F/35°C",
+		400: "104°F/40°C",
+		450: "113°F/45°C",
+		500: "122°F/50°C",
+		550: "131°F/55°C",
+		600: "140°F/60°C"],
+		def: 350, title: "High temperature alarm threshold", 
+		descr: "If temperature is higher than set value, overheat high temperature alarm will be triggered."], 
+	[key: "temperatureLow", num: 56, size: 2, type: "enum", options: [
+		0: "disabled",
+		6: "33°F/0.6°C",
+		10: "34°F/1°C",
+		22: "36°F/2.2°C",
+		33: "38°F/3.3°C",
+		44: "40°F/4.4°C",
+		50: "41°F/5°C",
+		100: "50°F/10°C",
+		150: "59°F/15°C",
+		200: "68°F/20°C",
+		250: "77°F/25°C"],
+		def: 100, title: "Low temperature alarm threshold", 
+		descr: "If temperature is lower than set value, low temperature alarm will be triggered."]
+	]
+}

devicetypes/fortrezz/fortrezz-mimo2-b-side.src/fortrezz-mimo2-b-side.groovy

@@ -1,102 +0,0 @@
-/**
- *  FortrezZ MIMO2+ B-Side
- *
- *  Copyright 2016 FortrezZ, LLC
- *
- *  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: "FortrezZ MIMO2+ B-Side", namespace: "fortrezz", author: "FortrezZ, LLC") {
-		capability "Contact Sensor"
-		capability "Relay Switch"
-		capability "Switch"
-		capability "Voltage Measurement"
-        capability "Refresh"
-	}
-    
-	tiles {
-         standardTile("switch", "device.switch", width: 2, height: 2) {
-            state "on", label: "Relay 2 On", action: "off", icon: "http://swiftlet.technology/wp-content/uploads/2016/06/Switch-On-104-edit.png", backgroundColor: "#53a7c0"            
-			state "off", label: "Relay 2 Off", action: "on", icon: "http://swiftlet.technology/wp-content/uploads/2016/06/Switch-Off-104-edit.png", backgroundColor: "#ffffff"
-        }
-        standardTile("anaDig1", "device.anaDig1", inactiveLabel: false) {
-			state "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#ffa81e"
-			state "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#79b821"
-            state "val", label:'${currentValue}v', unit:"", defaultState: true
-		}
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
-			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-        standardTile("powered", "device.powered", inactiveLabel: false) {
-			state "powerOn", label: "Power On", icon: "st.switches.switch.on", backgroundColor: "#79b821"
-			state "powerOff", label: "Power Off", icon: "st.switches.switch.off", backgroundColor: "#ffa81e"
-		}
-		standardTile("configure", "device.configure", inactiveLabel: false, decoration: "flat") {
-			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
-		}
-        standardTile("blank", "device.blank", inactiveLabel: true, decoration: "flat") {
-        	state("blank", label: '')
-        }
-		main (["switch"])
-		details(["switch", "anaDig1", "blank", "blank", "refresh", "powered"])
-	}
-}
-
-// parse events into attributes
-def parse(String description) {
-	log.debug "Parsing '${description}'"
-	// TODO: handle 'contact' attribute
-	// TODO: handle 'switch' attribute
-	// TODO: handle 'switch' attribute
-	// TODO: handle 'voltage' attribute
-
-}
-
-def eventParse(evt) {
-	log.debug("Event: ${evt.name}=${evt.value}")
-    switch(evt.name) {
-    	case "powered":
-        	sendEvent(name: evt.name, value: evt.value)
-        	break
-    	case "switch2":
-        	sendEvent(name: "switch", value: evt.value)
-        	break
-    	case "contact2":
-        	sendEvent(name: "contact", value: evt.value)
-        	break
-    	case "voltage2":
-        	sendEvent(name: "voltage", value: evt.value)
-        	break
-    	case "relay2":
-        	sendEvent(name: evt.name, value: evt.value)
-        	break
-    	case "anaDig2":
-        	sendEvent(name: "anaDig1", value: evt.value)
-        	break
-    }
-}
-
-// handle commands
-def on() {
-    parent.on2(device.id)
-	log.debug("Executing 'on'")
-	// TODO: Send Event to parent device for "on2"
-}
-
-def off() {
-    parent.off2(device.id)
-	log.debug("Executing 'off'")
-	// TODO: Send Event to parent device for "off2"
-}
-def refresh() {
-	parent.refresh2(device.id)
-    log.debug("Executing 'refresh'")
-}

devicetypes/fortrezz/fortrezz-mimo2.src/fortrezz-mimo2.groovy

@@ -1,379 +0,0 @@
-/**
- *  MIMO2 Device Handler
- *
- *  Copyright 2016 FortrezZ, LLC
- *
- *  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: "FortrezZ MIMO2+", namespace: "fortrezz", author: "FortrezZ, LLC") {
-		capability "Alarm"
-		capability "Contact Sensor"
-		capability "Switch"
-		capability "Voltage Measurement"
-        capability "Configuration"
-        capability "Refresh"
-        
-        attribute "powered", "string"
-        attribute "relay", "string"
-        
-        attribute "relay2", "string"
-        attribute "contact2", "string"
-        attribute "voltage2", "string"
-        
-		command "on"
-		command "off"
-        command "on2"
-        command "off2"
-        
-        fingerprint deviceId: "0x2100", inClusters: "0x5E,0x86,0x72,0x5A,0x59,0x71,0x98,0x7A"
-	}
-    
-    preferences {
-
-        input ("RelaySwitchDelay", "decimal", title: "Delay between relay switch on and off in seconds. Only Numbers 0 to 3 allowed. 0 value will remove delay and allow relay to function as a standard switch:\nRelay 1", description: "Numbers 0 to 3.1 allowed.", defaultValue: 0, required: false, displayDuringSetup: true)
-        input ("RelaySwitchDelay2", "decimal", title: "Relay 2", description: "Numbers 0 to 3.1 allowed.", defaultValue: 0, required: false, displayDuringSetup: true)
-        input ("Sig1AD", "bool", title: "Switch off for digital, on for analog:\nSIG1", required: false, displayDuringSetup: true)
-        input ("Sig2AD", "bool", title: "SIG2", required: false, displayDuringSetup: true)
-        } // the range would be 0 to 3.1, but the range value would not accept 3.1, only whole numbers (i tried paranthesis and fractions too. :( )
-
-       
-	tiles {
-         standardTile("switch", "device.switch", width: 2, height: 2) {
-            state "on", label: "Relay 1 On", action: "off", icon: "http://swiftlet.technology/wp-content/uploads/2016/06/Switch-On-104-edit.png", backgroundColor: "#53a7c0"            
-			state "off", label: "Relay 1 Off", action: "on", icon: "http://swiftlet.technology/wp-content/uploads/2016/06/Switch-Off-104-edit.png", backgroundColor: "#ffffff"
-
-        }
-         standardTile("switch2", "device.switch2", width: 2, height: 2, inactiveLabel: false) {
-            state "on", label: "Relay 2 On", action: "off2", icon: "http://swiftlet.technology/wp-content/uploads/2016/06/Switch-On-104-edit.png", backgroundColor: "#53a7c0"
-			state "off", label: 'Relay 2 Off', action: "on2", icon: "http://swiftlet.technology/wp-content/uploads/2016/06/Switch-Off-104-edit.png", backgroundColor: "#ffffff"
-        }
-        standardTile("anaDig1", "device.anaDig1", inactiveLabel: false) {
-			state "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#ffa81e"
-			state "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#79b821"
-            state "val", label:'${currentValue}v', unit:"", defaultState: true
-		}
-        standardTile("anaDig2", "device.anaDig2", inactiveLabel: false) {
-			state "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#ffa81e"
-			state "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#79b821"
-            state "val", label:'${currentValue}v', unit:"", defaultState: true
-		}
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
-			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-        standardTile("powered", "device.powered", inactiveLabel: false) {
-			state "powerOn", label: "Power On", icon: "st.switches.switch.on", backgroundColor: "#79b821"
-			state "powerOff", label: "Power Off", icon: "st.switches.switch.off", backgroundColor: "#ffa81e"
-		}
-		standardTile("configure", "device.configure", inactiveLabel: false, decoration: "flat") {
-			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
-		}
-        standardTile("blank", "device.blank", inactiveLabel: true, decoration: "flat") {
-        	state("blank", label: '')
-        }
-		main (["switch"])
-		details(["switch", "anaDig1", "blank", "switch2", "anaDig2", "blank", "configure", "refresh", "powered"])
-	}
-}
-
-// parse events into attributes
-def parse(String description) {
-	def result = null
-	def cmd = zwave.parse(description)
-    
-    if (cmd.CMD == "7105") {				//Mimo sent a power loss report
-    	log.debug "Device lost power"
-    	sendEvent(name: "powered", value: "powerOff", descriptionText: "$device.displayName lost power")
-    } else {
-    	sendEvent(name: "powered", value: "powerOn", descriptionText: "$device.displayName regained power")
-    }
-	if (cmd) {
-    	def eventReturn = zwaveEvent(cmd)
-        if(eventReturn in physicalgraph.device.HubMultiAction) {
-        	result = eventReturn
-        }
-        else {
-        	result = createEvent(eventReturn)
-        }
-	}
-    log.debug "Parse returned ${result} $cmd.CMD"
-	return result
-}
-
-def updated() { // neat built-in smartThings function which automatically runs whenever any setting inputs are changed in the preferences menu of the device handler
-    
-    if (state.count == 1) // this bit with state keeps the function from running twice ( which it always seems to want to do) (( oh, and state.count is a variable which is nonVolatile and doesn't change per every parse request.
-    {
-        state.count = 0
-        log.debug "Settings Updated..."
-        return response(delayBetween([
-            configure(), // the response() function is used for sending commands in reponse to an event, without it, no zWave commands will work for contained function
-            refresh()
-            ], 200))
-    }
-    else {state.count = 1}
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) // basic set is essentially our digital sensor for SIG1 and SIG2 - it doesn't use an endpoint so we are having it send a multilevelGet() for SIG1 and SIG2 to see which one triggered.
-{
-	log.debug "sent a BasicSet command"
-	return response(refresh())
-}
-
-def zwaveEvent(int endPoint, physicalgraph.zwave.commands.sensorbinaryv1.SensorBinaryReport cmd) // event to get the state of the digital sensor SIG1 and SIG2
-{
-	log.debug "sent a sensorBinaryReport command"
-	return response(refresh())
-}
-
-def zwaveEvent(int endPoint, physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd) // event for seeing the states of relay 1 and relay 2
-{
-	def map = [:] // map for containing the name and state fo the specified relay
-    if (endPoint == 3)
-    {
-    	if (cmd.value) // possible values are 255 and 0 (0 is false)
-    		{map.value = "on"}
-    	else
-    		{map.value = "off"}
-        map.name = "switch"
-        log.debug "sent a SwitchBinary command $map.name $map.value" // the map is only used for debug messages. not for the return command to the device
-        return [name: "switch", value: cmd.value ? "on" : "off"]
-    }
-    else if (endPoint == 4)
-    {
-    	if (cmd.value)
-    		{map.value = "on"}
-    	else
-    		{map.value = "off"}
-        map.name = "switch2"
-        sendEvent(name: "relay2", value: "$map.value")
-        log.debug "sent a SwitchBinary command $map.name $map.value" // the map is only used for debug messages. not for the return command to the device
-        return [name: "switch2", value: cmd.value ? "on" : "off"]
-    }
-}
-   
-def zwaveEvent (int endPoint, physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd) // sensorMultilevelReport is used to report the value of the analog voltage for SIG1
-{
-	def map = [:]
-    def stdEvent = [:]
-    def voltageVal = CalculateVoltage(cmd.scaledSensorValue) // saving the scaled Sensor Value used to enter into a large formula to determine actual voltage value
-    if (endPoint == 1) //endPoint 1 is for SIG1
-    {
-    	if (state.AD1 == false) // state.AD1 is  to determine which state the anaDig1 tile should be in (either analogue or digital mode)
-        {
-        	map.name = "anaDig1"
-            stdEvent.name = "contact"
-            if (voltageVal < 2) { // DK changed to 2v to follow LED behavior
-            	map.value = "closed"
-                stdEvent.value = "closed"
-            }
-            else
-            {
-            	map.value = "open"
-                stdEvent.value = "open"
-            } 
-        }
-        else //or state.AD1 is true for analogue mode
-        {
-        	map.name = "anaDig1"
-            stdEvent.name = "voltage"
-        	map.value = voltageVal
-            stdEvent.value = voltageVal
-        	map.unit = "v"
-            stdEvent.unit = "v"
-        }
-    }
-    else if (endPoint == 2) // endpoint 2 is for SIG2
-    {
-        if (state.AD2 == false)
-        {
-        	map.name = "anaDig2"
-            stdEvent.name = "contact2"
-            if (voltageVal < 2) {
-            	map.value = "closed"
-                stdEvent.value = "closed"
-            }
-            else
-            {
-            	map.value = "open"
-                stdEvent.value = "open"
-            } 
-        }
-        else
-        {
-        	map.name = "anaDig2"
-            stdEvent.name = "voltage2"
-        	map.value = voltageVal
-            stdEvent.value = voltageVal
-        	map.unit = "v"
-            stdEvent.unit = "v"
-        }
-    }
-	log.debug "sent a SensorMultilevelReport $map.name $map.value"
-    sendEvent(stdEvent)
-    return map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) { //standard security encapsulation event code (should be the same on all device handlers)
-    def encapsulatedCommand = cmd.encapsulatedCommand()
-    // can specify command class versions here like in zwave.parse
-    if (encapsulatedCommand) {
-        return zwaveEvent(encapsulatedCommand)
-    }
-}
-
-// MultiChannelCmdEncap and MultiInstanceCmdEncap are ways that devices
-// can indicate that a message is coming from one of multiple subdevices
-// or "endpoints" that would otherwise be indistinguishable
-def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiChannelCmdEncap cmd) {
-    def encapsulatedCommand = cmd.encapsulatedCommand()
-    log.debug ("Command from endpoint ${cmd.sourceEndPoint}: ${encapsulatedCommand}")
-
-    if (encapsulatedCommand) {
-        return zwaveEvent(cmd.sourceEndPoint, encapsulatedCommand)
-    }
-}
-
-def zwaveEvent(int endPoint, physicalgraph.zwave.commands.multichannelassociationv2.MultiChannelAssociationReport cmd) {
-	
-    log.debug "sent an Association Report"
-    log.debug " ${cmd.groupingIdentifier}"
-    //return [:]
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	// Handles all Z-Wave commands we aren't interested in
-     log.debug("Un-parsed Z-Wave message ${cmd}")
-	return [:]
-}
-
-def CalculateVoltage(ADCvalue) // used to calculate the voltage based on the collected Scaled sensor value of the multilevel sensor event
-{
-    def volt = (((2.396*(10**-17))*(ADCvalue**5)) - ((1.817*(10**-13))*(ADCvalue**4)) + ((5.087*(10**-10))*(ADCvalue**3)) - ((5.868*(10**-7))*(ADCvalue**2)) + ((9.967*(10**-4))*(ADCvalue)) - (1.367*(10**-2)))
-	return volt.round(1)
-}
-	
-
-def configure() {
-	log.debug "Configuring...." 
-    def sig1
-    def sig2
-    if (Sig1AD == true)
-    {	sig1 = 0x01
-        state.AD1 = true}
-    else if (Sig1AD == false) 
-    {	sig1 = 0x40
-    	state.AD1 = false}
-    if (Sig2AD == true)
-    {	sig2 = 0x01
-    	state.AD2 = true}
-    else if (Sig2AD == false) 
-    {	sig2 = 0x40
-    	state.AD2 = false}
-    
-	def delay = (RelaySwitchDelay*10).toInteger() // the input which we get from the user is a string and is in seconds while the MIMO2 configuration requires it in 100ms so - change to integer and multiply by 10  
-    def delay2 = (RelaySwitchDelay2*10).toInteger() // the input which we get from the user is a string and is in seconds while the MIMO2 configuration requires it in 100ms so - change to integer and multiply by 10
-	if (delay > 31) 
-    {
-        log.debug "Relay 1 input ${delay / 10} set too high. Max value is 3.1"
-        delay = 31
-    }
-    if (delay < 0) 
-    {
-        log.debug "Relay 1 input ${delay / 10} set too low. Min value is 0"
-        delay = 0
-    }
-    if (delay2 > 31) 
-    {
-    	log.debug "Relay 2 input ${delay2 / 10} set too high. Max value is 3.1"
-    	delay2 = 31
-    }
-     if (delay2 < 0) 
-    {
-    	log.debug "Relay 2 input ${delay2 / 10} set too low. Min value is 0"
-    	delay = 0
-    } 
-
-    
-    
-    return delayBetween([
-        encap(zwave.multiChannelAssociationV2.multiChannelAssociationSet(groupingIdentifier:3, nodeId:[zwaveHubNodeId]), 0),
-        encap(zwave.multiChannelAssociationV2.multiChannelAssociationSet(groupingIdentifier:2, nodeId:[zwaveHubNodeId]), 0),
-
-        encap(zwave.multiChannelAssociationV2.multiChannelAssociationSet(groupingIdentifier:2, nodeId:[zwaveHubNodeId]), 1),
-        encap(zwave.multiChannelAssociationV2.multiChannelAssociationSet(groupingIdentifier:2, nodeId:[zwaveHubNodeId]), 2),
-        encap(zwave.multiChannelAssociationV2.multiChannelAssociationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]), 3),
-        encap(zwave.multiChannelAssociationV2.multiChannelAssociationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]), 4),
-
-        secure(zwave.configurationV1.configurationSet(configurationValue: [sig1], parameterNumber: 3, size: 1)), // sends a multiLevelSensor report every 30 seconds for SIG1
-        secure(zwave.configurationV1.configurationSet(configurationValue: [sig2], parameterNumber: 9, size: 1)), // sends a multiLevelSensor report every 30 seconds for SIG2
-        secure(zwave.configurationV1.configurationSet(configurationValue: [delay], parameterNumber: 1, size: 1)), // configurationValue for parameterNumber means how many 100ms do you want the relay
-        																										// to wait before it cycles again / size should just be 1 (for 1 byte.)
-        secure(zwave.configurationV1.configurationSet(configurationValue: [delay2], parameterNumber: 2, size: 1)),
-        
-    ], 200)
-}
-
-def on() {	
-	return encap(zwave.basicV1.basicSet(value: 0xff), 3) // physically changes the relay from on to off and requests a report of the relay
-    // oddly, smartThings automatically sends a switchBinaryGet() command whenever the above basicSet command is sent, so we don't need to send one here.
-}
-
-def off() {
-    return encap(zwave.basicV1.basicSet(value: 0x00), 3) // physically changes the relay from on to off and requests a report of the relay
-		// oddly, smartThings automatically sends a switchBinaryGet() command whenever the above basicSet command is sent, so we don't need to send one here.
-}
-
-def on2() {
-   return encap(zwave.basicV1.basicSet(value: 0xff), 4)
-        // oddly, smartThings automatically sends a switchBinaryGet() command whenever the above basicSet command is sent, so we don't need to send one here.
-}
-
-def off2() {
-    return encap(zwave.basicV1.basicSet(value: 0x00), 4)
-        // oddly, smartThings automatically sends a switchBinaryGet() command whenever the above basicSet command is sent, so we don't need to send one here.
-}
-
-def refresh() {
-	log.debug "Refresh"
-	return delayBetween([
-         encap(zwave.sensorMultilevelV5.sensorMultilevelGet(), 1),// requests a report of the anologue input voltage for SIG1
-         encap(zwave.sensorMultilevelV5.sensorMultilevelGet(), 2),// requests a report of the anologue input voltage for SIG2
-         encap(zwave.switchBinaryV1.switchBinaryGet(), 3), //requests a report of the relay to make sure that it changed for Relay 1
-         encap(zwave.switchBinaryV1.switchBinaryGet(), 4), //requests a report of the relay to make sure that it changed for Relay 2
-       ],200)
-}
-
-def refreshZWave() {
-	log.debug "Refresh (Z-Wave Response)"
-	return delayBetween([
-         encap(zwave.sensorMultilevelV5.sensorMultilevelGet(), 1),// requests a report of the anologue input voltage for SIG1
-         encap(zwave.sensorMultilevelV5.sensorMultilevelGet(), 2),// requests a report of the anologue input voltage for SIG2
-         encap(zwave.switchBinaryV1.switchBinaryGet(), 3), //requests a report of the relay to make sure that it changed for Relay 1
-         encap(zwave.switchBinaryV1.switchBinaryGet(), 4) //requests a report of the relay to make sure that it changed for Relay 2
-       ],200)
-}
-
-private secureSequence(commands, delay=200) { // decided not to use this
-	return delayBetween(commands.collect{ secure(it) }, delay)
-}
-
-private secure(physicalgraph.zwave.Command cmd) { //take multiChannel message and securely encrypts the message so the device can read it
-	return zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
-}
-
-private encap(cmd, endpoint) { // takes desired command and encapsulates it by multiChannel and then sends it to secure() to be wrapped with another encapsulation for secure encryption
-	if (endpoint) {
-		return secure(zwave.multiChannelV3.multiChannelCmdEncap(bitAddress: false, sourceEndPoint:0, destinationEndPoint: endpoint).encapsulate(cmd))
-	} else {
-		return secure(cmd)
-	}
-}