From 13a056ec8d2c5d852c71422e8088deb5a4060115 Mon Sep 17 00:00:00 2001 From: Vinay Rao Date: Tue, 17 May 2016 09:59:03 -0700 Subject: [PATCH 1/3] 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 } From 6afcbf8f70615872e366d05124a9c2f175061664 Mon Sep 17 00:00:00 2001 From: Lars Finander Date: Wed, 11 May 2016 23:41:19 -0700 Subject: [PATCH 2/3] DVCSMP-1770 Add MSR to zwave-switch and configure at pairing -Make ZWave switch and Dimmer switch behave the same and save MSR and manufacturer name in data --- .../dimmer-switch.src/dimmer-switch.groovy | 1 + .../smartthings/zwave-switch.src/zwave-switch.groovy | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy b/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy index 6b7eca1..11af042 100644 --- a/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy +++ b/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy @@ -138,6 +138,7 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS log.debug "productTypeId: ${cmd.productTypeId}" def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId) updateDataValue("MSR", msr) + updateDataValue("manufacturer", cmd.manufacturerName) createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false]) } diff --git a/devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy b/devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy index cda2e69..798aa63 100644 --- a/devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy +++ b/devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy @@ -95,11 +95,17 @@ def zwaveEvent(physicalgraph.zwave.commands.hailv1.Hail cmd) { } def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) { - if (state.manufacturer != cmd.manufacturerName) { - updateDataValue("manufacturer", cmd.manufacturerName) - } + log.debug "manufacturerId: ${cmd.manufacturerId}" + log.debug "manufacturerName: ${cmd.manufacturerName}" + log.debug "productId: ${cmd.productId}" + log.debug "productTypeId: ${cmd.productTypeId}" + def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId) + updateDataValue("MSR", msr) + updateDataValue("manufacturer", cmd.manufacturerName) + createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false]) } + def zwaveEvent(physicalgraph.zwave.Command cmd) { // Handles all Z-Wave commands we aren't interested in [:] From 35edaa19c70e1a87df7f23ef11f8b7450923de86 Mon Sep 17 00:00:00 2001 From: Dwight Liu Date: Mon, 23 May 2016 14:38:40 -0700 Subject: [PATCH 3/3] Revert "DVCSMP-1739 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 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 }