MSA-1765: Aeon supply me this code to fix error in Motor Controller

DVCSMP-2391 Iris 4 button device mapping to button 1 only

devicetypes/bravenel/aeon-motor-controller.src/aeon-motor-controller.groovy

@@ -0,0 +1,145 @@
+/**
+ *  Aeon Motor Controller
+ *
+ *  Copyright 2015 Bruce Ravenel
+ *
+ *  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: "Aeon Motor Controller", namespace: "bravenel", author: "Bruce Ravenel") {
+		capability "Refresh"
+		capability "Actuator"
+        capability "doorControl"
+        capability "Switch"
+
+        command "up"
+        command "down"
+        command "stop"
+
+//		fingerprint inClusters: "0x26,0x32"
+	}
+
+	simulator {
+        status "up":   "command: 2604, payload: FF"
+        status "down": "command: 2604, payload: 00"
+        status "stop": "command: 2605, payload: FE"
+
+		["FF", "FE", "00"].each { val ->
+			reply "2001$val,delay 100,2602": "command: 2603, payload: $val"
+		}
+	}
+
+	tiles {
+		standardTile("motor", "device.motor", width: 2, height: 2) {
+			state("stopUp", label:'stop', icon:"st.doors.garage.garage-open", action: 'down', backgroundColor:"#79b821")
+			state("stopDn", label:'stop', icon:"st.doors.garage.garage-closed", action: 'up', backgroundColor:"#79b821")
+			state("up", label:'up', icon:"st.doors.garage.garage-opening", action:'stop', backgroundColor:"#ffe71e")
+			state("down", label:'down', icon:"st.doors.garage.garage-closing", action:'stop', backgroundColor:"#ffe71e")
+		}
+		valueTile("energy", "device.energy", decoration: "flat") {
+			state "default", label:' '
+		}
+		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+        standardTile("stop", "device.switch") {
+        	state "default", label:"", action: "stop", icon:"http://cdn.device-icons.smartthings.com/sonos/stop-btn@2x.png"
+        }
+        standardTile("up", "device.switch") {
+        	state "default", label: "Up", action: "up", icon:"http://cdn.device-icons.smartthings.com/thermostat/thermostat-up@2x.png"
+        }
+        standardTile("down", "device.switch") {
+        	state "default", label: "Down", action: "down", icon:"http://cdn.device-icons.smartthings.com/thermostat/thermostat-down@2x.png"
+        }
+	}
+	main(["motor"])
+	details(["motor",  "refresh", "energy", "up", "down", "stop",])
+}
+
+// parse events into attributes
+def parse(String description) {
+	def result = []
+	def cmd = zwave.parse(description, [0x20: 1, 0x26: 3])
+	if (cmd) {
+		result = zwaveEvent(cmd)
+		log.debug("'$description' parsed to $result")
+	} else {
+		log.debug("Couldn't zwave.parse '$description'")
+	}
+	result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
+	motorEvents(cmd)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
+	motorEvents(cmd)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv3.SwitchMultilevelReport cmd) {
+	motorEvents(cmd)
+}
+
+def motorEvents(physicalgraph.zwave.Command cmd) {
+	def result = []
+    def switchEvent = []
+    if(cmd.value == 0) {switchEvent = createEvent(name: "motor", value: "down", descriptionText: text)}
+    else if(cmd.value == 254) {
+    	def stopVal = state.up ? "stopUp" : "stopDn"
+    	switchEvent = createEvent(name: "motor", value: stopVal, descriptionText: text)
+    }
+    else if(cmd.value == 255) {switchEvent = createEvent(name: "motor", value: "up", descriptionText: text)}
+	result << switchEvent
+}
+
+def refresh() {
+	zwave.switchMultilevelV1.switchMultilevelGet().format()
+}
+
+def up() {
+	state.up = true
+	delayBetween([
+    	zwave.basicV1.basicSet(value: 0xFF).format(),
+		zwave.switchMultilevelV1.switchMultilevelGet().format()
+    ], 1000)
+}
+
+def down() {
+	state.up = false
+	delayBetween([
+    	zwave.basicV1.basicSet(value: 0x00).format(),
+		zwave.switchMultilevelV1.switchMultilevelGet().format()
+    ], 1000)
+}
+
+def stop() {
+	delayBetween([
+    	zwave.switchMultilevelV1.switchMultilevelStopLevelChange().format(),
+		zwave.switchMultilevelV1.switchMultilevelGet().format()
+    ], 1000)
+}
+
+def on() {
+	state.up = true
+	delayBetween([
+    	zwave.basicV1.basicSet(value: 0xFF).format(),
+		zwave.switchMultilevelV1.switchMultilevelGet().format()
+    ], 1000)
+}
+
+def off() {
+	state.up = false
+	delayBetween([
+    	zwave.basicV1.basicSet(value: 0x00).format(),
+		zwave.switchMultilevelV1.switchMultilevelGet().format()
+    ], 1000)
+}

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

@@ -40,14 +40,11 @@ metadata {
 
 // Parse incoming device messages to generate events
 def parse(String description) {
-	def name = null
-	def value = description
-	if (zigbee.isZoneType19(description)) {
-		name = "contact"
-		value = zigbee.translateStatusZoneType19(description) ? "open" : "closed"
+	def resMap
+	if (description.startsWith("zone")) {
+		resMap = createEvent(name: "contact", value: zigbee.parseZoneStatus(description).isAlarm1Set() ? "open" : "closed")
 	}
 	
-	def result = createEvent(name: name, value: value)
-	log.debug "Parse returned ${result?.descriptionText}"
-	return result
+	log.debug "Parse returned $resMap"
+	return resMap
 }

devicetypes/smartthings/smartsense-garage-door-multi.src/smartsense-garage-door-multi.groovy

@@ -88,7 +88,7 @@ def parse(String description) {
 	log.debug "parse($description)"
 	def results = [:]
 
-	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
+	if (!isSupportedDescription(description) || description.startsWith("zone")) {
 		// Ignore this in favor of orientation-based state
 		// results = parseSingleMessage(description)
 	}

devicetypes/smartthings/smartsense-garage-door-sensor-button.src/smartsense-garage-door-sensor-button.groovy

@@ -117,7 +117,7 @@ def parse(String description) {
 	log.debug "parse($description)"
 	def results = null
 
-	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
+	if (!isSupportedDescription(description) || description.startsWith("zone")) {
 		// Ignore this in favor of orientation-based state
 		// results = parseSingleMessage(description)
 	}

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

@@ -45,7 +45,7 @@ metadata {
 
 def parse(String description) {
 	def results = [:]
-	if (isZoneType19(description) || !isSupportedDescription(description)) {
+	if (description.startsWith("zone") || !isSupportedDescription(description)) {
 		results = parseBasicMessage(description)
 	}
 	else if (isMotionStatusMessage(description)){
@@ -87,16 +87,12 @@ private String parseName(String description) {
 }
 
 private String parseValue(String description) {
-	if (isZoneType19(description)) {
-		if (translateStatusZoneType19(description)) {
-			return "active"
-		}
-		else {
-			return "inactive"
-		}
+	def zs = zigbee.parseZoneStatus(description)
+	if (zs) {
+		zs.isAlarm1Set() ? "active" : "inactive"
+	} else {
+		description
 	}
-
-	description
 }
 
 private parseDescriptionText(String linkText, String value, String description) {

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

@@ -86,7 +86,7 @@ metadata {
 def parse(String description) {
 	def results
 
-	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
+	if (!isSupportedDescription(description) || description.startsWith("zone")) {
 		results = parseSingleMessage(description)
 	}
 	else if (description == 'updated') {
@@ -488,12 +488,7 @@ private String parseValue(String description) {
 	if (!isSupportedDescription(description)) {
 		return description
 	}
-	else if (zigbee.translateStatusZoneType19(description)) {
-		return "open"
-	}
-	else {
-		return "closed"
-	}
+	return zigbee.parseZoneStatus(description)?.isAlarm1Set() ? "open" : "closed"
 }
 
 private parseDescriptionText(String linkText, String value, String description) {

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

@@ -96,7 +96,7 @@ metadata {
 def parse(String description) {
 	def results
 
-	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
+	if (!isSupportedDescription(description) || description.startsWith("zone")) {
 		// Ignore this in favor of orientation-based state
 		// results = parseSingleMessage(description)
 	}

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

@@ -118,15 +118,38 @@ private Map getBatteryResult(rawValue) {
 private Map parseNonIasButtonMessage(Map descMap){
     def buttonState = ""
     def buttonNumber = 0
-    if (((device.getDataValue("model") == "3460-L") || (device.getDataValue("model") == "3450-L"))
-            &&(descMap.clusterInt == 0x0006)) {
-        if (descMap.command == "01") {
+    if ((device.getDataValue("model") == "3460-L") &&(descMap.clusterInt == 0x0006)) {
+        if (descMap.commandInt == 1) {
             getButtonResult("press")
         }
-        else if (descMap.command == "00") {
+        else if (descMap.commandInt == 0) {
             getButtonResult("release")
         }
     }
+    else if ((device.getDataValue("model") == "3450-L") && (descMap.clusterInt == 0x0006)) {
+        if (descMap.commandInt == 1) {
+            getButtonResult("press")
+        }
+        else if (descMap.commandInt == 0) {
+            def button = 1
+            switch(descMap.sourceEndpoint) {
+                case "01":
+                    button = 4
+                    break
+                case "02":
+                    button = 3
+                    break
+                case "03":
+                    button = 1
+                    break
+                case "04":
+                    button = 2
+                    break
+            }
+        
+            getButtonResult("release", button)
+        }
+    }
     else if (descMap.clusterInt == 0x0006) {
         buttonState = "pushed"
         if (descMap.command == "01") {