MSA-2113: Multi-Input Multi-Output device with 2 low voltage signal inputs and 2 low voltage relay outputs. Device handler allows user to see all 4 device endpoints and control each relay independently and view signal status as a voltage or (open/closed) status, depending on the signal type that is connected. There's two devices type handlers (a-side & b-side). These are for users to be able to create separate devices for each of the relays and inputs, so they can control them with rules and scenes in smart-home monitor or other smart-apps.

Rolling down staging to master

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

@@ -0,0 +1,102 @@
+/**
+ *  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

@@ -0,0 +1,379 @@
+/**
+ *  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)
+	}
+}

devicetypes/redloro-smartthings/yamaha-zone.src/yamaha-zone.groovy

@@ -1,284 +0,0 @@
-/**
- *  SmartThings Device Handler: Yamaha Zone
- *
- *  Author: redloro@gmail.com
- *
- *  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: "Yamaha Zone", namespace: "redloro-smartthings", author: "redloro@gmail.com") {
-
-    /**
-     * List our capabilties. Doing so adds predefined command(s) which
-     * belong to the capability.
-     */
-    capability "Music Player"
-    capability "Switch"
-    capability "Switch Level"
-    capability "Refresh"
-    capability "Polling"
-    capability "Sensor"
-    capability "Actuator"
-
-    /**
-     * Define all commands, ie, if you have a custom action not
-     * covered by a capability, you NEED to define it here or
-     * the call will not be made.
-     *
-     * To call a capability function, just prefix it with the name
-     * of the capability, for example, refresh would be "refresh.refresh"
-     */
-    command "source0"
-    command "source1"
-    command "source2"
-    command "source3"
-    command "source4"
-    command "source5"
-    command "mutedOn"
-    command "mutedOff"
-    command "partyModeOn"
-    command "partyModeOff"
-    command "zone"
-  }
-
-  /**
-   * Define the various tiles and the states that they can be in.
-   * The 2nd parameter defines an event which the tile listens to,
-   * if received, it tries to map it to a state.
-   *
-   * You can also use ${currentValue} for the value of the event
-   * or ${name} for the name of the event. Just make SURE to use
-   * single quotes, otherwise it will only be interpreted at time of
-   * launch, instead of every time the event triggers.
-   */
-  tiles(scale: 2) {
-    multiAttributeTile(name:"state", type:"lighting", width:6, height:4) {
-      tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-        attributeState "on", label:'On', action:"switch.off", icon:"st.Electronics.electronics16", backgroundColor:"#79b821", nextState:"off"
-        attributeState "off", label:'Off', action:"switch.on", icon:"st.Electronics.electronics16", backgroundColor:"#ffffff", nextState:"on"
-      }
-      tileAttribute ("source", key: "SECONDARY_CONTROL") {
-        attributeState "source", label:'${currentValue}'
-      }
-    }
-
-    // row
-    //controlTile("volume", "device.volume", "slider", height: 1, width: 6, range:"(0..100)") {
-    controlTile("volume", "device.volume", "slider", height: 1, width: 6, range:"(-80..16)") {
-      state "volume", label: "Volume", action:"music Player.setLevel", backgroundColor:"#00a0dc"
-    }
-
-    // row
-    standardTile("0", "device.source0", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV1", action:"source0", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV1", action:"source0", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-    standardTile("1", "device.source1", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV2", action:"source1", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV2", action:"source1", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-    standardTile("2", "device.source2", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV3", action:"source2", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV3", action:"source2", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-    standardTile("3", "device.source3", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV4", action:"source3", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV4", action:"source3", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-    standardTile("4", "device.source4", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV5", action:"source4", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV5", action:"source4", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-    standardTile("5", "device.source5", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV6", action:"source5", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV6", action:"source5", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-
-    // row
-    standardTile("muted", "device.muted", decoration: "flat", width: 2, height: 2) {
-      state("off", label:'Muted', action:"mutedOn", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff", nextState:"on")
-      state("on", label:'Muted', action:"mutedOff", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-mute.png", backgroundColor:"#ffffff", nextState:"off")
-    }
-    standardTile("partyMode", "device.partyMode", decoration: "flat", width: 2, height: 2, inactiveLabel: false) {
-      state("off", label:'Party Mode', action:"partyModeOn", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff", nextState:"on")
-      state("on", label:'Party Mode', action:"partyModeOff", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-party.png", backgroundColor:"#ffffff", nextState:"off")
-    }
-    standardTile("refresh", "device.status", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
-      state "default", label:"Refresh", action:"refresh.refresh", icon:"st.secondary.refresh-icon", backgroundColor:"#ffffff"
-    }
-
-    // Defines which tile to show in the overview
-    main "state"
-
-    // Defines which tile(s) to show when user opens the detailed view
-    details([
-      "state",
-      "volume",
-      "0","1","2","3","4","5",
-      "muted", "partyMode","refresh"
-    ])
-  }
-
-  preferences {
-    input name: "source0", type: "text", title: "Source 1", defaultValue: "AV1"
-    input name: "source1", type: "text", title: "Source 2", defaultValue: "AV2"
-    input name: "source2", type: "text", title: "Source 3", defaultValue: "AV3"
-    input name: "source3", type: "text", title: "Source 4", defaultValue: "AV4"
-    input name: "source4", type: "text", title: "Source 5", defaultValue: "AV5"
-    input name: "source5", type: "text", title: "Source 6", defaultValue: "AV6"
-  }
-}
-
-/**************************************************************************
- * The following section simply maps the actions as defined in
- * the metadata into onAction() calls.
- *
- * This is preferred since some actions can be dealt with more
- * efficiently this way. Also keeps all user interaction code in
- * one place.
- *
- */
-def on() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Power_Control><Power>On</Power></Power_Control></${getZone()}></YAMAHA_AV>")
-  sendEvent(name: "switch", value: "on")
-}
-def off() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Power_Control><Power>Standby</Power></Power_Control></${getZone()}></YAMAHA_AV>")
-  sendEvent(name: "switch", value: "off")
-}
-def setLevel(value) {
-  //sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Volume><Lvl><Val>${(Math.round(value * 9 / 5) * 5 - 800).intValue()}</Val><Exp>1</Exp><Unit>dB</Unit></Lvl></Volume></${getZone()}></YAMAHA_AV>")
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Volume><Lvl><Val>${(value * 10).intValue()}</Val><Exp>1</Exp><Unit>dB</Unit></Lvl></Volume></${getZone()}></YAMAHA_AV>")
-  sendEvent(name: "volume", value: value)
-}
-def source0() {
-  setSource(0)
-}
-def source1() {
-  setSource(1)
-}
-def source2() {
-  setSource(2)
-}
-def source3() {
-  setSource(3)
-}
-def source4() {
-  setSource(4)
-}
-def source5() {
-  setSource(5)
-}
-def mutedOn() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Volume><Mute>On</Mute></Volume></${getZone()}></YAMAHA_AV>")
-  sendEvent(name: "muted", value: "on")
-}
-def mutedOff() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Volume><Mute>Off</Mute></Volume></${getZone()}></YAMAHA_AV>")
-  sendEvent(name: "muted", value: "off")
-}
-def partyModeOn() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><System><Party_Mode><Mode>On</Mode></Party_Mode></System></YAMAHA_AV>")
-  sendEvent(name: "partyMode", value: "on")
-}
-def partyModeOff() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><System><Party_Mode><Mode>Off</Mode></Party_Mode></System></YAMAHA_AV>")
-  sendEvent(name: "partyMode", value: "off")
-}
-def refresh() {
-  sendCommand("<YAMAHA_AV cmd=\"GET\"><${getZone()}><Basic_Status>GetParam</Basic_Status></${getZone()}></YAMAHA_AV>")
-  sendCommand("<YAMAHA_AV cmd=\"GET\"><System><Party_Mode><Mode>GetParam</Mode></Party_Mode></System></YAMAHA_AV>")
-}
-/**************************************************************************/
-
-/**
- * Called every so often (every 5 minutes actually) to refresh the
- * tiles so the user gets the correct information.
- */
-def poll() {
-  refresh()
-}
-
-def parse(String description) {
-  return
-}
-
-def setSource(id) {
-  //log.debug "source: "+getSourceName(id)
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Input><Input_Sel>"+getSourceName(id)+"</Input_Sel></Input></${getZone()}></YAMAHA_AV>")
-  setSourceTile(getSourceName(id))
-}
-
-def getSourceName(id) {
-  if (settings) {
-    return settings."source${id}"
-  } else {
-    return ['AV1', 'AV2', 'AV3', 'AV4', 'AV5', 'AV6'].get(id)
-  }
-}
-
-def setSourceTile(name) {
-  sendEvent(name: "source", value: "Source: ${name}")
-  for (def i = 0; i < 6; i++) {
-    if (name == getSourceName(i)) {
-      sendEvent(name: "source${i}", value: "on")
-    }
-    else {
-      sendEvent(name: "source${i}", value: "off")
-    }
-  }
-}
-
-def zone(evt) {
-  /*
-  * Zone On/Off
-  */
-  if (evt.Basic_Status.Power_Control.Power.text()) {
-    sendEvent(name: "switch", value: (evt.Basic_Status.Power_Control.Power.text() == "On") ? "on" : "off")
-  }
-
-  /*
-  * Zone Volume
-  */
-  if (evt.Basic_Status.Volume.Lvl.Val.text()) {
-    def int volLevel = evt.Basic_Status.Volume.Lvl.Val.toInteger() ?: -250
-    //sendEvent(name: "volume", value: ((volLevel + 800) / 9).intValue())
-    sendEvent(name: "volume", value: (volLevel / 10).intValue())
-  }
-
-  /*
-  * Zone Muted
-  */
-  if (evt.Basic_Status.Volume.Mute.text()) {
-    sendEvent(name: "muted", value: (evt.Basic_Status.Volume.Mute.text() == "On") ? "on" : "off")
-  }
-
-  /*
-  * Zone Source
-  */
-  if (evt.Basic_Status.Input.Input_Sel.text()) {
-    setSourceTile(evt.Basic_Status.Input.Input_Sel.text())
-  }
-
-  /*
-  * Party Mode
-  */
-  if (evt.Party_Mode.Mode.text()) {
-    sendEvent(name: "partyMode", value: (evt.Party_Mode.Mode.text() == "On") ? "on" : "off")
-  }
-}
-
-private sendCommand(body) {
-  parent.sendCommand(body)
-}
-
-private getZone() {
-  return new String(device.deviceNetworkId).tokenize('|')[2]
-}

devicetypes/smartthings/aeon-multisensor-6.src/README.md

@@ -27,13 +27,9 @@ Works with:
 ## Device Health
 
 Aeon Labs MultiSensor 6 is polled by the hub.
-As of hubCore version 0.14.38 the hub sends up reports every 15 minutes regardless of whether the state changed.
+Aeon MultiSensor reports in once every hour.
-Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*15 + 2)mins = 32 mins.
-Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for
-the device to appear as ONLINE again. This is because if this listening device does not respond to two poll requests in a row,
-it is not polled for 5 minutes by the hub. This can delay up the process of being marked ONLINE by quite some time.
 
-* __32min__ checkInterval
+* __122min__ checkInterval
 
 ## Troubleshooting
 

devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy

@@ -130,13 +130,13 @@ metadata {
 }
 
 def installed(){
-// Device-Watch simply pings if no device events received for 32min(checkInterval)
+// Device-Watch simply pings if no device events received for 122min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }
 
 def updated() {
-// Device-Watch simply pings if no device events received for 32min(checkInterval)
+// Device-Watch simply pings if no device events received for 122min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 	log.debug "Updated with settings: ${settings}"
 	log.debug "${device.displayName} is now ${device.latestValue("powerSupply")}"
 

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

@@ -171,8 +171,8 @@ private Map getBatteryResult(rawValue) {
 			def pct = batteryMap[volts]
 			result.value = pct
 		} else {
-			def minVolts = 2.1
+			def minVolts = 2.4
-			def maxVolts = 3.0
+			def maxVolts = 2.7
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
 			if (roundedPct <= 0)

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

@@ -274,7 +274,7 @@ private Map getBatteryResult(rawValue) {
 			result.value = pct
 		} else {
 			def minVolts = 2.1
-			def maxVolts = 3.0
+			def maxVolts = 2.7
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
 			if (roundedPct <= 0)

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

@@ -15,10 +15,9 @@ metadata {
 	definition (name: "Z-Wave Thermostat", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Temperature Measurement"
-		capability "Relative Humidity Measurement"
 		capability "Thermostat"
 		capability "Configuration"
-		capability "Polling"
+		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
 		
@@ -117,7 +116,7 @@ metadata {
 			state "cool", label:'${currentValue}° cool', backgroundColor:"#ffffff"
 		}
 		standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"polling.poll", icon:"st.secondary.refresh"
+			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 		main "temperature"
 		details(["temperature", "mode", "fanMode", "heatSliderControl", "heatingSetpoint", "coolSliderControl", "coolingSetpoint", "refresh"])
@@ -125,13 +124,20 @@ metadata {
 }
 
 def installed(){
-	// Device-Watch simply pings if no device events received for 32min(checkInterval)
+	sendHubCommand(new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format()))
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	initialize()
 }
 
 def updated(){
+	initialize()
+}
+
+def initialize() {
 	// Device-Watch simply pings if no device events received for 32min(checkInterval)
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	unschedule()
+	runEvery5Minutes("refresh")
+	refresh()
 }
 
 def parse(String description)
@@ -149,6 +155,7 @@ def parse(String description)
 		]
 		if (map.name == "thermostatMode") {
 			state.lastTriedMode = map.value
+			map.data = [supportedThermostatModes:state.supportedThermostatModes]
 			if (map.value == "cool") {
 				map2.value = device.latestValue("coolingSetpoint")
 				log.info "THERMOSTAT, latest cooling setpoint = ${map2.value}"
@@ -172,6 +179,7 @@ def parse(String description)
 		}
 	} else if (map.name == "thermostatFanMode" && map.isStateChange) {
 		state.lastTriedFanMode = map.value
+		map.data = [supportedThermostatFanModes: state.supportedThermostatFanModes]
 	}
 	log.debug "Parse returned $result"
 	result
@@ -305,26 +313,26 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanMod
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeSupportedReport cmd) {
-	def supportedModes = ""
+	def supportedModes = []
-	if(cmd.off) { supportedModes += "off " }
+	if(cmd.off) { supportedModes << "off" }
-	if(cmd.heat) { supportedModes += "heat " }
+	if(cmd.heat) { supportedModes << "heat" }
-	if(cmd.auxiliaryemergencyHeat) { supportedModes += "emergency heat " }
+	if(cmd.cool) { supportedModes << "cool" }
-	if(cmd.cool) { supportedModes += "cool " }
+	if(cmd.auto) { supportedModes << "auto" }
-	if(cmd.auto) { supportedModes += "auto " }
+	if(cmd.auxiliaryemergencyHeat) { supportedModes << "emergency heat" }
 
-	state.supportedModes = supportedModes
+	state.supportedThermostatModes = supportedModes
-	// No events to be generated, return empty map
+	sendEvent(name: "supportedThermostatModes", value: supportedModes, displayed: false)
 	return [:]
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeSupportedReport cmd) {
-	def supportedFanModes = ""
+	def supportedFanModes = []
-	if(cmd.auto) { supportedFanModes += "auto " } // "fanAuto "
+	if(cmd.auto) { supportedFanModes << "auto" } // "fanAuto "
-	if(cmd.low) { supportedFanModes += "on " } // "fanOn"
+	if(cmd.circulation) { supportedFanModes << "circulate" } // "fanCirculate"
-	if(cmd.circulation) { supportedFanModes += "circulate " } // "fanCirculate"
+	if(cmd.low) { supportedFanModes << "on" } // "fanOn"
 
-	state.supportedFanModes = supportedFanModes
+	state.supportedThermostatFanModes = supportedFanModes
-	// No events to be generated, return empty map
+	sendEvent(name: "supportedThermostatFanModes", value: supportedFanModes, displayed: false)
 	return [:]
 }
 
@@ -337,15 +345,17 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 // Command Implementations
-def poll() {
+def refresh() {
-	delayBetween([
+	def cmds = []
-		zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format())
-		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format(),
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format())
-		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format(),
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeGet().format())
-		zwave.thermostatModeV2.thermostatModeGet().format(),
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeGet().format())
-		zwave.thermostatFanModeV3.thermostatFanModeGet().format(),
+	cmds << new physicalgraph.device.HubAction(zwave.sensorMultilevelV2.sensorMultilevelGet().format()) // current temperature
-		zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format()
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format())
-	], 2300)
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format())
+	sendHubCommand(cmds)
 }
 
 def quickSetHeat(degrees) {
@@ -416,28 +426,14 @@ def ping() {
 	poll()
 }
 
-def configure() {
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSupportedGet().format(),
-		zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format(),
-		zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format(),
-		zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
-		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format(),
-		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format(),
-		zwave.thermostatModeV2.thermostatModeGet().format(),
-		zwave.thermostatFanModeV3.thermostatFanModeGet().format(),
-		zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format()
-	], 2300)
-}
-
 def modes() {
-	["off", "heat", "cool", "auto", "emergency heat"]
+	return state.supportedThermostatModes
 }
 
 def switchMode() {
 	def currentMode = device.currentState("thermostatMode")?.value
-	def lastTriedMode = state.lastTriedMode ?: currentMode ?: "off"
+	def lastTriedMode = state.lastTriedMode ?: currentMode ?: ["off"]
-	def supportedModes = getDataByName("supportedModes")
+	def supportedModes = getDataByName("supportedThermostatModes")
 	def modeOrder = modes()
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
@@ -454,7 +450,7 @@ def switchMode() {
 }
 
 def switchToMode(nextMode) {
-	def supportedModes = getDataByName("supportedModes")
+	def supportedModes = getDataByName("supportedThermostatModes")
 	if(supportedModes && !supportedModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
 	if (nextMode in modes()) {
 		state.lastTriedMode = nextMode
@@ -466,9 +462,9 @@ def switchToMode(nextMode) {
 
 def switchFanMode() {
 	def currentMode = device.currentState("thermostatFanMode")?.value
-	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: "off"
+	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: ["off"]
-	def supportedModes = getDataByName("supportedFanModes") ?: "auto on" // "fanAuto fanOn"
+	def supportedModes = getDataByName("supportedThermostatFanModes") ?: ["auto", "on"]
-	def modeOrder = ["auto", "circulate", "on"]                 // "fanAuto", "fanCirculate", "fanOn"
+	def modeOrder = state.supportedThermostatFanModes
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
 	while (!supportedModes?.contains(nextMode) && nextMode != "auto") { // "fanAuto"
@@ -478,7 +474,7 @@ def switchFanMode() {
 }
 
 def switchToFanMode(nextMode) {
-	def supportedFanModes = getDataByName("supportedFanModes")
+	def supportedFanModes = getDataByName("supportedThermostatFanModes")
 	if(supportedFanModes && !supportedFanModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
 
 	def returnCommand

smartapps/redloro-smartthings/yamaha-receiver.src/yamaha-receiver.groovy

@@ -1,154 +0,0 @@
-/**
- *  SmartThings SmartApp: Yamaha Network Receiver
- *
- *  Author: redloro@gmail.com
- *
- *  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.
- *
- *  https://github.com/PSeitz/yamaha-nodejs
- *  http://<RECEIVER_IP_ADDRESS>/YamahaRemoteControl/desc.xml
- */
-import groovy.util.XmlSlurper
-
-definition(
-  name: "Yamaha Receiver",
-  namespace: "redloro-smartthings",
-  author: "redloro@gmail.com",
-  description: "Yamaha SmartApp",
-  category: "My Apps",
-  iconUrl: "https://raw.githubusercontent.com/redloro/smartthings/master/images/yamaha-receiver.png",
-  iconX2Url: "https://raw.githubusercontent.com/redloro/smartthings/master/images/yamaha-receiver.png",
-  iconX3Url: "https://raw.githubusercontent.com/redloro/smartthings/master/images/yamaha-receiver.png"
-)
-
-preferences {
-  section("SmartThings Hub") {
-    input "hostHub", "hub", title: "Select Hub", multiple: false, required: true
-  }
-  section("Yamaha Receiver") {
-    input name: "receiverName", type: "text", title: "Name", required: true, defaultValue: "Yamaha"
-    input name: "receiverIp", type: "text", title: "IP", required: true
-    input name: "receiverZones", type: "enum", title: "Zones", required: true, multiple: true, options: ["Main_Zone","Zone_B","Zone_2","Zone_3","Zone_4"]
-  }
-}
-
-def installed() {
-  subscribeToEvents()
-}
-
-def subscribeToEvents() {
-  subscribe(location, null, lanResponseHandler, [filterEvents:false])
-}
-
-def updated() {
-  addChildDevices()
-}
-
-def uninstalled() {
-  removeChildDevices()
-}
-
-def lanResponseHandler(evt) {
-  def map = stringToMap(evt.stringValue)
-
-  //verify that this message is from Yamaha Receiver IP
-  if (!map.ip || map.ip != convertIPtoHex(settings.receiverIp)) {
-    return
-  }
-
-  def headers = getHttpHeaders(map.headers);
-  def body = getHttpBody(map.body);
-  //log.trace "Headers: ${headers}"
-  //log.trace "Body: ${body}"
-
-  updateZoneDevices(body.children()[0])
-}
-
-private updateZoneDevices(evt) {
-  //log.debug "updateZoneDevices: ${evt.toString()}"
-  if (evt.name() == "System") {
-    //log.debug "Update all zones"
-    childDevices*.zone(evt)
-    return
-  }
-
-  def zonedevice = getChildDevice(getDeviceId(evt.name()))
-  if (zonedevice) {
-    zonedevice.zone(evt)
-  }
-
-  //check for Zone_B
-  zonedevice = getChildDevice(getDeviceId("Zone_B"))
-  if (zonedevice && evt.name() == "Main_Zone") {
-    zonedevice.zone(evt)
-  }
-}
-
-private addChildDevices() {
-  // add yamaha device
-  settings.receiverZones.each {
-    def deviceId = getDeviceId(it)
-    if (!getChildDevice(deviceId)) {
-      addChildDevice("redloro-smartthings", "Yamaha Zone", deviceId, hostHub.id, ["name": it, label: "${settings.receiverName}: ${it}", completedSetup: true])
-      log.debug "Added Yamaha zone: ${deviceId}"
-    }
-  }
-
-  childDevices*.refresh()
-}
-
-private removeChildDevices() {
-  getAllChildDevices().each { deleteChildDevice(it.deviceNetworkId) }
-}
-
-private sendCommand(body) {
-  //log.debug "Yamaha Network Receiver send command: ${body}"
-
-  def hubAction = new physicalgraph.device.HubAction(
-      headers: [HOST: getReceiverAddress()],
-      method: "POST",
-      path: "/YamahaRemoteControl/ctrl",
-      body: body
-  )
-  sendHubCommand(hubAction)
-}
-
-private getHttpHeaders(headers) {
-  def obj = [:]
-  new String(headers.decodeBase64()).split("\r\n").each {param ->
-    def nameAndValue = param.split(":")
-    obj[nameAndValue[0]] = (nameAndValue.length == 1) ? "" : nameAndValue[1].trim()
-  }
-  return obj
-}
-
-private getHttpBody(body) {
-  def obj = null;
-  if (body) {
-    obj = new XmlSlurper().parseText(new String(body.decodeBase64()))
-  }
-  return obj
-}
-
-private getDeviceId(zone) {
-  return "yamaha|${settings.receiverIp}|${zone}"
-}
-
-private getReceiverAddress() {
-  return settings.receiverIp + ":80"
-}
-
-private String convertIPtoHex(ipAddress) {
-  return ipAddress.tokenize( '.' ).collect {  String.format( '%02x', it.toInteger() ) }.join().toUpperCase()
-}
-
-private String convertPortToHex(port) {
-  return port.toString().format( '%04x', port.toInteger() ).toUpperCase()
-}