Merge pull request #1546 from skt123/dimmer_switch

[CHF-487] Health Check for Z-Wave Dimmer Switch
Merge pull request #1550 from parijatdas/enerwave
2026-03-09 13:21:53 +00:00 · 2016-12-29 10:29:43 -08:00 · 2016-12-29 10:27:18 -08:00 · 2016-12-27 11:36:51 -08:00 · 2016-12-20 18:33:50 +05:30 · 2016-12-20 12:08:16 +05:30
10 changed files with 26 additions and 18 deletions
--- a/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy
+++ b/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy
@@ -22,9 +22,10 @@ metadata {
 		capability "Sensor"
 		capability "Health Check"

-		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
-		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
-		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "Z-Wave Plug-In Dimmer"
+		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "GE In-Wall Smart Dimmer "
+		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "GE In-Wall Smart Dimmer "
+		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "GE Plug-In Smart Dimmer "
+		fingerprint mfr:"0063", prod:"4944", model:"3034", deviceJoinName: "GE In-Wall Smart Fan Control"
 	}

 	simulator {
--- a/devicetypes/smartthings/life360-user.src/life360-user.groovy
+++ b/devicetypes/smartthings/life360-user.src/life360-user.groovy
@@ -39,7 +39,7 @@ metadata {
 }

 def generatePresenceEvent(boolean present) {
-	log.debug "Here in generatePresenceEvent!"
+	log.info "Life360 generatePresenceEvent($present)"
 	def value = formatValue(present)
 	def linkText = getLinkText(device)
 	def descriptionText = formatDescriptionText(linkText, present)
--- a/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
@@ -128,7 +128,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
@@ -132,7 +132,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
@@ -161,7 +161,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if(cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -339,7 +339,7 @@ private Map getContactResult(value) {
 	log.debug "Contact: ${device.displayName} value = ${value}"
 	def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
 	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true)
-	sendEvent(name: 'status', value: value, descriptionText: descriptionText, translatable: true)
+	return [name: 'status', value: value, descriptionText: descriptionText, translatable: true]
 }

 private getAccelerationResult(numValue) {
--- a/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
@@ -119,7 +119,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07){
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
@@ -103,7 +103,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy
+++ b/devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy
@@ -24,6 +24,10 @@ metadata {
 		fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1902", deviceJoinName: "Z-Wave Dimmer"
 		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"
 	}

 	simulator {
--- a/devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy
+++ b/devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy
@@ -25,6 +25,9 @@ metadata {
 		fingerprint mfr:"0063", prod:"4F50", model:"3031", deviceJoinName: "GE Plug-in Outdoor Switch"
 		fingerprint mfr:"001D", prod:"1D04", model:"0334", deviceJoinName: "Leviton Outlet"
 		fingerprint mfr:"001D", prod:"1C02", model:"0334", deviceJoinName: "Leviton Switch"
+		fingerprint mfr:"001D", prod:"0301", model:"0334", deviceJoinName: "Leviton 15A Switch"
+		fingerprint mfr:"011A", prod:"0101", model:"0102", deviceJoinName: "Enerwave On/Off Switch"
+		fingerprint mfr:"011A", prod:"0101", model:"0603", deviceJoinName: "Enerwave Duplex Receptacle"
 	}

 	// simulator metadata
--- a/smartapps/smartthings/life360-connect.src/life360-connect.groovy
+++ b/smartapps/smartthings/life360-connect.src/life360-connect.groovy
@@ -289,12 +289,12 @@ def initializeLife360Connection() {
       		state.life360AccessToken = result.data.access_token
            return true;
   		}
-		log.debug "Response=${result.data}"
+		log.info "Life360 initializeLife360Connection, response=${result.data}"
        return false;
        
    }
    catch (e) {
-       log.debug e
+       log.error "Life360 initializeLife360Connection, error: $e"
       return false;
    }

@@ -656,7 +656,7 @@ def generateInitialEvent (member, childDevice) {
    
    try { // we are going to just ignore any errors
    
-    	log.debug "Generate Initial Event for New Device for Member = ${member.id}"
+    	log.info "Life360 generateInitialEvent($member, $childDevice)"
        
        def place = state.places.find{it.id==settings.place}
        
@@ -677,6 +677,8 @@ def generateInitialEvent (member, childDevice) {
        	// log.debug "Distance Away = ${distanceAway}"
  
  			boolean isPresent = (distanceAway <= placeRadius)
+
+			log.info "Life360 generateInitialEvent, member: ($memberLatitude, $memberLongitude), place: ($placeLatitude, $placeLongitude), radius: $placeRadius, dist: $distanceAway, present: $isPresent"
                
        	// log.debug "External Id=${app.id}:${member.id}"
        
@@ -718,7 +720,7 @@ def haversine(lat1, lon1, lat2, lon2) {

 def placeEventHandler() {

-	log.debug "In placeEventHandler method."
+	log.info "Life360 placeEventHandler: params=$params, settings.place=$settings.place"

 	// the POST to this end-point will look like:
    // POST http://test.com/webhook?circleId=XXXX&placeId=XXXX&userId=XXXX&direction=arrive
@@ -729,8 +731,6 @@ def placeEventHandler() {
    def direction = params?.direction
    def timestamp = params?.timestamp
    
-    log.debug "Life360 Event: Circle: ${circleId}, Place: ${placeId}, User: ${userId}, Direction: ${direction}"
-
    if (placeId == settings.place) {

 		def presenceState = (direction=="in")
@@ -745,10 +745,10 @@ def placeEventHandler() {

 		if (deviceWrapper) {
 			deviceWrapper.generatePresenceEvent(presenceState)
-    		log.debug "Event raised on child device: ${externalId}"
+    		log.debug "Life360 event raised on child device: ${externalId}"
 		}
   		else {
-    		log.debug "Couldn't find child device associated with inbound Life360 event."
+    		log.warn "Life360 couldn't find child device associated with inbound Life360 event."
    	}
    }
Author	SHA1	Message	Date
Jack Chi	c028515fcd	Merge pull request #1546 from skt123/dimmer_switch [CHF-487] Health Check for Z-Wave Dimmer Switch	2016-12-29 10:29:43 -08:00
Jack Chi	751c98d123	Merge pull request #1550 from parijatdas/enerwave [CHF-488] [CHF-489] [CHF-490] Implementation of HealthCheck for Enerwave Duplex Receptacle ZW15R, Enerwave On/Off Switch ZW15S and Leviton 15A Switch VRS15-1LZ	2016-12-29 10:27:18 -08:00
Jack Chi	5b874e8f3a	Merge pull request #1545 from pchomal/dimmerswitch_generic [CHF-477] Health Check for Z-Wave Dimmer Switch Generic	2016-12-27 11:36:51 -08:00
Parijat Das	9e10405527	Added fingerprints for the following devices: 1. Enerwave Duplex Receptacle ZW15R 2. Enerwave On/Off Switch ZW15S 3. Leviton 15A Switch VRS15-1LZ	2016-12-20 18:33:50 +05:30
sushant.k1	32ceaff54d	[CHF-487] Added Health Check Implementation for: 1. 1,000-Watt In-Wall Smart Dimmer Switch (GE 12725) 2. In-Wall Smart Fan Control (GE 12730)	2016-12-20 12:08:16 +05:30
piyush.c	5b1da30a47	[CHF-477] Health Check implementation for Z-Wave Dimmer Switch Generic with checkinterval of 32min	2016-12-20 10:39:08 +05:30
Vinay Rao	0a82077b24	Merge pull request #1519 from SmartThingsCommunity/staging Rolling down staging hotfix to master	2016-12-07 14:15:16 -08:00
Vinay Rao	38ef9e5c77	Merge pull request #1517 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-12-07 12:10:01 -08:00
Vinay Rao	6a71615ca5	Merge pull request #1505 from varzac/sendevent-appengine-fix DPROT-215 Don't use sendEvent for AppEngine parse events	2016-12-02 11:39:24 -08:00
Zach Varberg	9939591005	Don't use sendEvent for AppEngine parse events With the changes made for https://smartthings.atlassian.net/browse/DPROT-200 there were a few DTHs that were using sendEvent to directly send events generated during parse. However, because using sendEvent didn't result in parse returning an event AppEngine would send the description up to the cloud DTH to be handled. In some cases this resulted in multiple events for the same device trigger. This resolves: https://smartthings.atlassian.net/browse/DPROT-215	2016-12-01 14:52:24 -06:00
Vinay Rao	d7f2bc1d79	Merge pull request #1502 from bflorian/PROB-1426-life360-logging PROB-1426 adding logging to Life360	2016-11-28 13:20:16 -08:00
bflorian	3c5d727d4c	PROB-1426 adding logging to Life360	2016-11-28 16:00:42 -05:00