From 8821c68e9cd146f916eddc219882230ec0bb8b88 Mon Sep 17 00:00:00 2001 From: Dwight Liu Date: Fri, 6 May 2016 12:50:02 -0700 Subject: [PATCH 1/3] null zwave event check in 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..5ced1c8 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 "Null zwave command" } - log.debug "Parse returned ${result?.descriptionText}" - - storeGraphData(result.name, result.value) - return result } From 0e01cbed06cc39ca8506bc34aab6369339725bf7 Mon Sep 17 00:00:00 2001 From: Dwight Liu Date: Tue, 10 May 2016 13:40:52 -0700 Subject: [PATCH 2/3] make descriptive comment and add space in else condition --- .../aeon-home-energy-meter-c3.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 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 5ced1c8..7359d4a 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 @@ -96,8 +96,8 @@ def parse(String description) { result = createEvent(zwaveEvent(cmd)) log.debug "Parse returned ${result?.descriptionText}" storeGraphData(result.name, result.value) - }else{ - log.debug "Null zwave command" + } else { + log.debug "zwave.parse returned null command. Cannot create event" } return result } From e1de599668d5e07c41012ec46d537a7397a646e5 Mon Sep 17 00:00:00 2001 From: Dwight Liu Date: Tue, 10 May 2016 14:23:46 -0700 Subject: [PATCH 3/3] make sure reformat the storeGraphData --- .../aeon-home-energy-meter-c3.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7359d4a..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 @@ -95,7 +95,7 @@ def parse(String description) { if (cmd) { result = createEvent(zwaveEvent(cmd)) log.debug "Parse returned ${result?.descriptionText}" - storeGraphData(result.name, result.value) + storeGraphData(result.name, result.value) } else { log.debug "zwave.parse returned null command. Cannot create event" }