From a4a48fddd21928df02c853e7b997d0c311452f5a Mon Sep 17 00:00:00 2001 From: tslagle13 Date: Wed, 11 May 2016 12:07:03 -0700 Subject: [PATCH 1/5] fix exception caused by typo added paren to end of "someoneIsHome" check on accident. --- .../vacation-lighting-director.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smartapps/tslagle13/vacation-lighting-director.src/vacation-lighting-director.groovy b/smartapps/tslagle13/vacation-lighting-director.src/vacation-lighting-director.groovy index 517d5ee..c3187b7 100644 --- a/smartapps/tslagle13/vacation-lighting-director.src/vacation-lighting-director.groovy +++ b/smartapps/tslagle13/vacation-lighting-director.src/vacation-lighting-director.groovy @@ -273,7 +273,7 @@ def scheduleCheck(evt) { else { if(people){ //don't turn off lights if anyone is home - if(someoneIsHome()){ + if(someoneIsHome){ log.debug("Stopping Check for Light") unschedule() } From cca1eccce63b98dec34846267122398ab4f9fa76 Mon Sep 17 00:00:00 2001 From: Vinay Rao Date: Thu, 12 May 2016 16:02:20 -0700 Subject: [PATCH 2/5] moving the cree specific generic fingerprint back to cree dth because of cree manufacturerInfo spacing issue --- devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy | 3 +-- .../smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy b/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy index 020272b..70548b0 100644 --- a/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy +++ b/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy @@ -14,7 +14,6 @@ * */ -//@Deprecated: Moved to ZLL Dimmer Bulb metadata { definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings") { @@ -25,7 +24,7 @@ metadata { capability "Switch" capability "Switch Level" - //fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019" + fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019" } // simulator metadata diff --git a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy index 6ba2cfc..720e7d5 100644 --- a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy +++ b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy @@ -22,7 +22,8 @@ metadata { capability "Switch" capability "Switch Level" - fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019" + //fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019" + fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0019" fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019", manufacturer: "CREE", model: "Connected A-19 60W Equivalent", deviceJoinName: "Cree Connected Bulb" fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 W clear", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light" fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 W clear - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light" From 17562c96ae8e094c8a812baa906ae2600d41a33d Mon Sep 17 00:00:00 2001 From: Vinay Rao Date: Mon, 16 May 2016 14:54:09 -0700 Subject: [PATCH 3/5] removing cree fingerprint from zll dimmer until the fix in trim for deviceJoinName --- .../smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy index 720e7d5..eb0d0e1 100644 --- a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy +++ b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy @@ -24,7 +24,7 @@ metadata { //fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019" fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0019" - fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019", manufacturer: "CREE", model: "Connected A-19 60W Equivalent", deviceJoinName: "Cree Connected Bulb" + //fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019", manufacturer: "CREE", model: "Connected A-19 60W Equivalent", deviceJoinName: "Cree Connected Bulb" fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 W clear", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light" fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 W clear - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light" fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0019", manufacturer: "Philips", model: "LWB006", deviceJoinName: "Philips Hue White" From a8e118fe83e4182ef985db9403e8a541ac4a238d Mon Sep 17 00:00:00 2001 From: David Sainte-Claire Date: Mon, 16 May 2016 17:19:25 -0700 Subject: [PATCH 4/5] Revert "make sure reformat the storeGraphData" This reverts commit e1de599668d5e07c41012ec46d537a7397a646e5. Revert "make descriptive comment and add space in else condition" This reverts commit 0e01cbed06cc39ca8506bc34aab6369339725bf7. Revert "null zwave event check in storeGraphData" This reverts commit 8821c68e9cd146f916eddc219882230ec0bb8b88. --- .../aeon-home-energy-meter-c3.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy b/devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy index f214597..90291d5 100644 --- a/devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy +++ b/devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy @@ -94,11 +94,11 @@ def parse(String description) { def cmd = zwave.parse(description, [0x31: 1, 0x32: 1, 0x60: 3]) if (cmd) { result = createEvent(zwaveEvent(cmd)) - log.debug "Parse returned ${result?.descriptionText}" - storeGraphData(result.name, result.value) - } else { - log.debug "zwave.parse returned null command. Cannot create event" } + log.debug "Parse returned ${result?.descriptionText}" + + storeGraphData(result.name, result.value) + return result } From 13a056ec8d2c5d852c71422e8088deb5a4060115 Mon Sep 17 00:00:00 2001 From: Vinay Rao Date: Tue, 17 May 2016 09:59:03 -0700 Subject: [PATCH 5/5] Revert "Undo DVCSMP-1739 Revert "make sure reformat the storeGraphData"" --- .../aeon-home-energy-meter-c3.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy b/devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy index 90291d5..f214597 100644 --- a/devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy +++ b/devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy @@ -94,11 +94,11 @@ def parse(String description) { def cmd = zwave.parse(description, [0x31: 1, 0x32: 1, 0x60: 3]) if (cmd) { result = createEvent(zwaveEvent(cmd)) + log.debug "Parse returned ${result?.descriptionText}" + storeGraphData(result.name, result.value) + } else { + log.debug "zwave.parse returned null command. Cannot create event" } - log.debug "Parse returned ${result?.descriptionText}" - - storeGraphData(result.name, result.value) - return result }