Merge pull request SmartThingsCommunity#2594 from SmartThingsCommunity/staging

Rolling up staging to production

Author: workingmonk

devicetypes/curb/curb-power-meter.src/curb-power-meter.groovy

@@ -0,0 +1,58 @@
+/**
+ *  Curb Power Meter
+ *
+ *  Copyright 2017 Curb
+ *
+ *  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: "CURB Power Meter", namespace: "curb", author: "Curb") {
+        capability "Power Meter"
+        capability "Energy Meter"
+    }
+
+    tiles {
+        multiAttributeTile(name: "power", type: "lighting", width: 2, height: 2, canChangeIcon: false) {
+            tileAttribute("device.power", key: "PRIMARY_CONTROL") {
+                attributeState "power",
+                    label: '${currentValue} W',
+                    icon: 'st.switches.switch.off',
+                    backgroundColors: [
+                        [value: -1000, color: "#25c100"],
+                        [value: -500, color: "#76ce61"],
+                        [value: -100, color: "#bbedaf"],
+                        [value: 0, color: "#bcbbb5"],
+                        [value: 100, color: "#efc621"],
+                        [value: 1000, color: "#ed8c25"],
+                        [value: 2000, color: "#db5e1f"]
+                    ]
+            }
+            tileAttribute ("device.energy", key: "SECONDARY_CONTROL") {
+                attributeState "energy", label:'${currentValue} kWh this billing period'
+            }
+        }
+        main(["power"])
+        details(["power", "energy"])
+    }
+}
+
+mappings {
+
+}
+
+def handlePower(value) {
+    sendEvent(name: "power", value: value)
+}
+
+def handleKwhBilling(kwh) {
+    sendEvent(name: "energy", value: kwh.round(3))
+}

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

@@ -97,9 +97,23 @@ def updated() {
 def parse(String description) {
 	log.debug "parse($description)"
 	def result = null
-	def cmd = zwave.parse(description, [0x98: 1, 0x20: 1, 0x70: 1])
-	if (cmd) {
-		result = zwaveEvent(cmd)
+	if (description.startsWith("Err")) {
+		if (state.sec) {
+			result = createEvent(descriptionText:description, displayed:false)
+		} else {
+			result = createEvent(
+					descriptionText: "This device failed to complete the network security key exchange. If you are unable to control it via SmartThings, you must remove it from your network and add it again.",
+					eventType: "ALERT",
+					name: "secureInclusion",
+					value: "failed",
+					displayed: true,
+			)
+		}
+	} else {
+		def cmd = zwave.parse(description, [0x98: 1, 0x20: 1, 0x70: 1])
+		if (cmd) {
+			result = zwaveEvent(cmd)
+		}
 	}
 	log.debug "Parse returned ${result?.inspect()}"
 	return result

devicetypes/smartthings/momentary-button-tile.src/momentary-button-tile.groovy

@@ -30,7 +30,7 @@ metadata {
 
 	// UI tile definitions
 	tiles(scale: 2){
-		multiAttributeTile(name:"switch", type: "generic", width: 6, height: 4){
+		multiAttributeTile(name:"switch", type: "generic", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute("device.switch", key: "PRIMARY_CONTROL") {
 				attributeState("off", label: 'Push', action: "momentary.push", backgroundColor: "#ffffff", nextState: "on")
 				attributeState("on", label: 'Push', action: "momentary.push", backgroundColor: "#00a0dc")

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

@@ -243,9 +243,9 @@ def reloadAllCodes() {
 	sendEvent(lockCodesEvent(lockCodes))
 	def cmds = validateAttributes()
 	if (isYaleLock()) {
-		state.checkCode = 1
+		state.checkCode = state.checkCode ?: 1
 	} else {
-		state.checkCode = 0
+		state.checkCode = state.checkCode ?: 0
 	}
 	cmds += requestCode(state.checkCode)
 
@@ -729,10 +729,15 @@ private def parseCommandResponse(String description) {
 				// This will be applicable when a slot is found occupied during scanning of lock
 				// Populating the 'lockCodes' attribute after scanning a code slot
 				log.debug "Scanning lock - code $codeID is occupied"
-				responseMap.value = "$codeID set"
-				responseMap.descriptionText = "${getStatusForDescription('set')} \"$codeName\""
+				def changeType = getChangeType(lockCodes, codeID)
+				responseMap.value = "$codeID $changeType"
+				responseMap.descriptionText = "${getStatusForDescription(changeType)} \"$codeName\""
 				responseMap.data = [ codeName: codeName ]
-				result << codeSetEvent(lockCodes, codeID, codeName)
+				if ("set" == changeType) {
+					result << codeSetEvent(lockCodes, codeID, codeName)
+				} else {
+					responseMap.displayed = false
+				}
 			}
 		} else {
 			// Code slot is empty - can happen when code creation fails or a slot is empty while scanning the lock
@@ -759,7 +764,6 @@ private def parseCommandResponse(String description) {
 				// Code slot is empty - can happen when a slot is found empty while scanning the lock
 				responseMap.value = "$codeID unset"
 				responseMap.descriptionText = "Code slot $codeID found empty during scanning"
-				responseMap.isStateChange = false
 				responseMap.displayed = false
 			}
 		}

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

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	definition (name: "Z-Wave Dimmer Switch Generic", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+	definition (name: "Z-Wave Dimmer Switch Generic", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light", runLocally: true, minHubCoreVersion: '000.019.00012', executeCommandsLocally: true) {
 		capability "Switch Level"
 		capability "Actuator"
 		capability "Health Check"

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

@@ -769,14 +769,14 @@ def zwaveEvent(UserCodeReport cmd) {
 		} else {
 			// We'll land here during scanning of codes
 			codeName = getCodeName(lockCodes, codeID)
+			def changeType = getChangeType(lockCodes, codeID)
 			if (!lockCodes[codeID]) {
-				map.value = "$codeID set"
 				result << codeSetEvent(lockCodes, codeID, codeName)
 			} else {
-				map.value = "$codeID changed"
-				map.isStateChange = false
+				map.displayed = false
 			}
-			map.descriptionText = "${getStatusForDescription('set')} \"$codeName\""
+			map.value = "$codeID $changeType"
+			map.descriptionText = "${getStatusForDescription(changeType)} \"$codeName\""
 			map.data = [ codeName: codeName, lockName: deviceName ]
 		}
 	} else if(userIdStatus == 254 && isSchlageLock()) {
@@ -806,7 +806,7 @@ def zwaveEvent(UserCodeReport cmd) {
 				result << codeDeletedEvent(lockCodes, codeID)
 			} else {
 				map.value = "$codeID unset"
-				map.isStateChange = false
+				map.displayed = false
 				map.data = [ lockName: deviceName ]
 			}
 		}
@@ -1184,7 +1184,7 @@ def reloadAllCodes() {
 	sendEvent(name: "scanCodes", value: "Scanning", descriptionText: "Code scan in progress", displayed: false)
 	def lockCodes = loadLockCodes()
 	sendEvent(lockCodesEvent(lockCodes))
-	state.checkCode = 1
+	state.checkCode = state.checkCode ?: 1
 
 	def cmds = []
 	// Not calling validateAttributes() here because userNumberGet command will be added twice
@@ -1196,7 +1196,7 @@ def reloadAllCodes() {
 		cmds << secure(zwave.userCodeV1.usersNumberGet())
 	} else {
 		sendEvent(name: "maxCodes", value: state.codes, displayed: false)
-		cmds << requestCode(1)
+		cmds << requestCode(state.checkCode)
 	}
 	if(cmds.size() > 1) {
 		cmds = delayBetween(cmds, 4200)

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

@@ -37,7 +37,7 @@ metadata {
 
 	// tile definitions
 	tiles(scale: 2){
-		multiAttributeTile(name:"switch", type: "generic", width: 6, height: 4){
+		multiAttributeTile(name:"switch", type: "generic", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute("device.switch", key: "PRIMARY_CONTROL") {
 				attributeState("on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00a0dc")
 				attributeState("off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff")

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	definition (name: "Z-Wave Switch Generic", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.switch") {
+	definition (name: "Z-Wave Switch Generic", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.switch", runLocally: true, minHubCoreVersion: '000.019.00012', executeCommandsLocally: true) {
 		capability "Actuator"
 		capability "Health Check"
  		capability "Switch"
@@ -64,6 +64,7 @@ metadata {
 def installed(){
 // Device-Watch simply pings if no device events received for checkInterval duration of 32min = 2 * 15min + 2min lag time
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID, offlinePingable: "1"])
+	response(refresh())
 }
 
 def updated(){

devicetypes/zenwithin/zen-thermostat.src/zen-thermostat.groovy

@@ -4,7 +4,7 @@
  *  Author: Zen Within
  *  Date: 2015-02-21
  *  Updated by SmartThings
- *  Date: 2017-10-12
+ *  Date: 2017-11-12
  */
 metadata {
     definition (name: "Zen Thermostat", namespace: "zenwithin", author: "ZenWithin") {
@@ -23,7 +23,7 @@ metadata {
         // To please some of the thermostat SmartApps
         command "poll"
 
-		fingerprint profileId: "0104", endpointId: "01", inClusters: "0000,0001,0003,0004,0005,0020,0201,0202,0204,0B05", outClusters: "000A, 0019", manufacturer: "Zen Within", model: "Zen-01", deviceJoinName: "Zen Thermostat"
+        fingerprint profileId: "0104", endpointId: "01", inClusters: "0000,0001,0003,0004,0005,0020,0201,0202,0204,0B05", outClusters: "000A, 0019", manufacturer: "Zen Within", model: "Zen-01", deviceJoinName: "Zen Thermostat"
     }
 
     tiles {
@@ -89,8 +89,12 @@ metadata {
         section {
             input("systemModes", "enum",
                 title: "Thermostat configured modes\nSelect the modes the thermostat has been configured for, as displayed on the thermostat",
-                description: "off, heat, cool", defaultValue: "1", required: true, multiple: false,
-                options:["1":"off, heat, cool", "2":"off, auto, heat, cool", "3":"off, emergency heat, heat, cool"]
+                description: "off, heat, cool", defaultValue: "3", required: true, multiple: false,
+                options:["1":"off, heat",
+                        "2":"off, cool",
+                        "3":"off, heat, cool",
+                        "4":"off, auto, heat, cool",
+                        "5":"off, emergency heat, heat, cool"]
             )
         }
     }
@@ -126,9 +130,11 @@ def getSupportedModes() {
 
 def getSupportedModesMap() {
     [
-        "1":["off", "heat", "cool"],
-        "2":["off", "auto", "heat", "cool"],
-        "3":["off", "emergency heat", "heat", "cool"]
+        "1":["off", "heat"],
+        "2":["off", "cool"],
+        "3":["off", "heat", "cool"],
+        "4":["off", "auto", "heat", "cool"],
+        "5":["off", "emergency heat", "heat", "cool"]
     ]
 }