Merge pull request SmartThingsCommunity#3319 from SmartThingsCommunit…

…y/staging

Rolling down staging to master

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

@@ -28,6 +28,7 @@ metadata {
 		fingerprint mfr: "001D", prod: "3201", model: "0001", deviceJoinName: "Leviton Dimmer Switch"
 		fingerprint mfr: "001D", prod: "1B03", model: "0334", deviceJoinName: "Leviton Universal Dimmer"
 		fingerprint mfr: "011A", prod: "0102", model: "0201", deviceJoinName: "Enerwave In-Wall Dimmer"
+		fingerprint mfr: "001D", prod: "1001", model: "0334", deviceJoinName: "Leviton 3-Speed Fan Controller"
 		fingerprint mfr: "001D", prod: "0602", model: "0334", deviceJoinName: "Leviton Magnetic Low Voltage Dimmer"
 		fingerprint mfr: "001D", prod: "0401", model: "0334", deviceJoinName: "Leviton 600W Incandescent Dimmer"
 		fingerprint mfr: "0111", prod: "8200", model: "0200", deviceJoinName: "Remotec Technology Plug-In Dimmer"
@@ -36,6 +37,9 @@ metadata {
 		fingerprint mfr: "0039", prod: "5044", model: "3038", deviceJoinName: "Honeywell Z-Wave Plug-in Dimmer"
 		fingerprint mfr: "0039", prod: "4944", model: "3038", deviceJoinName: "Honeywell Z-Wave In-Wall Smart Dimmer"
 		fingerprint mfr: "0039", prod: "4944", model: "3130", deviceJoinName: "Honeywell Z-Wave In-Wall Smart Toggle Dimmer"
+		fingerprint mfr: "0063", prod: "4944", model: "3034", deviceJoinName: "GE In-Wall Smart Fan Control"
+		fingerprint mfr: "0063", prod: "4944", model: "3131", deviceJoinName: "GE In-Wall Smart Fan Control"
+		fingerprint mfr: "0039", prod: "4944", model: "3131", deviceJoinName: "Honeywell Z-Wave Plus In-Wall Fan Speed Control"
 		fingerprint mfr: "001A", prod: "4449", model: "0101", deviceJoinName: "Eaton RF Master Dimmer"
 		fingerprint mfr: "001A", prod: "4449", model: "0003", deviceJoinName: "Eaton RF Dimming Plug-In Module"
 		fingerprint mfr: "0086", prod: "0103", model: "0063", deviceJoinName: "Aeotec Smart Dimmer 6"

smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy

@@ -521,6 +521,13 @@ def poll() {
 def pollResponse(response, data) {
 	if (response.hasError()) {
 		log.error "Harmony - response has error: $response.errorMessage"
+		def activities = getChildDevices()
+		// Device-Watch relies on the Logitech Harmony Cloud to get the Device state.
+		activities.each { activity ->
+			if ("${activity.deviceNetworkId}".contains("harmony-${it.key}")) {
+				activity.sendEvent(name: "DeviceWatch-DeviceStatus", value: "offline", displayed: false, isStateChange: true)
+			}
+		}
 		if (response.status == 401) { // token is expired
 			state.remove("HarmonyAccessToken")
 			log.warn "Harmony - Access token has expired"
@@ -539,10 +546,9 @@ def pollResponse(response, data) {
 			def activities = getChildDevices()
 			ResponseValues.hubs.each {
 				// Device-Watch relies on the Logitech Harmony Cloud to get the Device state.
-				def isAlive = it.value.status
 				activities.each { activity ->
 					if ("${activity.deviceNetworkId}".contains("harmony-${it.key}")) {
-						activity.sendEvent(name: "DeviceWatch-DeviceStatus", value: isAlive!=504? "online":"offline", displayed: false, isStateChange: true)
+						activity.sendEvent(name: "DeviceWatch-DeviceStatus", value: "online", displayed: false, isStateChange: true)
 					}
 				}
 				if (it.value.message == "OK") {