Merge pull request SmartThingsCommunity#3023 from SmartThingsCommunity/staging

Rolling down staging to master

Author: workingmonk

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

@@ -298,12 +298,17 @@ void resumeProgram() {
 	def deviceId = device.deviceNetworkId.split(/\./).last()
 	if (parent.resumeProgram(deviceId)) {
 		sendEvent("name":"thermostat", "value":"setpoint is updating", "description":statusText, displayed: false)
-		sendEvent("name":"resumeProgram", "value":"resume", descriptionText: "resumeProgram is done", displayed: false, isStateChange: true)
 	} else {
-		sendEvent("name":"thermostat", "value":"failed resume click refresh", "description":statusText, displayed: false)
+		sendEvent("name":"thermostat", "value":"resume failed", "description":statusText, displayed: false)
 		log.error "Error resumeProgram() check parent.resumeProgram(deviceId)"
 	}
-	runIn(5, "refresh", [overwrite: true])
+	// Prevent double tap and spamming of resume command
+	runIn(5, "updateResume", [overwrite: true])
+}
+
+def updateResume() {
+	sendEvent("name":"resumeProgram", "value":"resume", descriptionText: "resumeProgram is done", displayed: false, isStateChange: true)
+	refresh()
 }
 
 def modes() {
@@ -334,9 +339,10 @@ def switchToMode(mode) {
 	if (!(parent.setMode(((mode == "emergency heat") ? "auxHeatOnly" : mode), deviceId))) {
 		log.warn "Error setting mode:$mode"
 		// Ensure the DTH tile is reset
-		generateModeEvent(device.currentValue("thermostatMode"))
+		mode = device.currentValue("thermostatMode")
 	}
-	runIn(5, "refresh", [overwrite: true])
+	generateModeEvent(mode)
+	generateStatusEvent()
 }
 
 def switchFanMode() {
@@ -356,9 +362,9 @@ def switchToFanMode(fanMode) {
 	if (!(parent.setFanMode(heatingSetpoint, coolingSetpoint, deviceId, sendHoldType, fanMode))) {
 		log.warn "Error setting fanMode:fanMode"
 		// Ensure the DTH tile is reset
-		generateFanModeEvent(device.currentValue("thermostatFanMode"))
+		fanMode = device.currentValue("thermostatFanMode")
 	}
-	runIn(5, "refresh", [overwrite: true])
+	generateFanModeEvent(fanMode)
 }
 
 def getDataByName(String name) {
@@ -522,10 +528,11 @@ def updateSetpoint(data) {
 				unit: getTemperatureScale(), eventType: "ENTITY_UPDATE", displayed: false)
 		sendEvent("name": "coolingSetpoint", "value": getTempInLocalScale(data.targetCoolingSetpoint, deviceScale),
 				unit: getTemperatureScale(), eventType: "ENTITY_UPDATE", displayed: false)
+		generateStatusEvent()
 	} else {
 		log.error "Error updateSetpoint"
+		runIn(5, "refresh", [overwrite: true])
 	}
-	runIn(5, "refresh", [overwrite: true])
 }
 
 def generateStatusEvent() {

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

@@ -29,7 +29,6 @@ metadata {
 		fingerprint inClusters: "0x20,0x25,0x86,0x80,0x85,0x72,0x71"
 		fingerprint mfr: "0258", prod: "0003", model: "0088", deviceJoinName: "Neo Coolcam Siren Alarm"
 		fingerprint mfr: "021F", prod: "0003", model: "0088", deviceJoinName: "Dome Siren"
-		fingerprint mfr: "0060", prod: "000C", model: "0001", deviceJoinName: "Utilitech Siren"
 	}
 
 	simulator {
@@ -69,7 +68,6 @@ def installed() {
 def updated() {
 	// Device-Watch simply pings if no device events received for 122min(checkInterval)
 	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, isStateChanged: true, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-	refresh()
 }
 
 def createEvents(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {