From 69ac99ad516f25289d4e76e18a1a2ec81c84bd4d Mon Sep 17 00:00:00 2001 From: "Marta Wierzbinska/Home IoT Development (IoT) /SRPOL/Professional/Samsung Electronics" Date: Mon, 18 Jan 2021 17:45:09 +0100 Subject: [PATCH 1/2] Added power reports configuration and moved query for energy meter report --- .../qubino/qubino-dimmer.src/qubino-dimmer.groovy | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/devicetypes/qubino/qubino-dimmer.src/qubino-dimmer.groovy b/devicetypes/qubino/qubino-dimmer.src/qubino-dimmer.groovy index 95679f85517..3c403445164 100644 --- a/devicetypes/qubino/qubino-dimmer.src/qubino-dimmer.groovy +++ b/devicetypes/qubino/qubino-dimmer.src/qubino-dimmer.groovy @@ -233,6 +233,10 @@ def configure() { commands << zwave.multiChannelAssociationV2.multiChannelAssociationRemove(groupingIdentifier:1, nodeId:[]) commands << zwave.multiChannelAssociationV2.multiChannelAssociationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]) commands << zwave.multiChannelAssociationV2.multiChannelAssociationGet(groupingIdentifier: 1) + if (isDINDimmer()) { + //parameter 42 - power reporting time threshold + commands << zwave.configurationV1.configurationSet(parameterNumber: 42, size: 2, scaledConfigurationValue: 2 * 15 * 60 + 2 * 60) + } commands += getRefreshCommands() commands += getReadConfigurationFromTheDeviceCommands() @@ -327,7 +331,6 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) { def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd, ep = null) { log.debug "BasicReport: ${cmd}" - sendHubCommand(encapCommands(getPowerMeterCommands())) dimmerEvents(cmd) } @@ -351,7 +354,10 @@ def handleMeterReport(cmd) { createEvent(name: "energy", value: cmd.scaledMeterValue, unit: "kVAh") } else if (cmd.scale == 2) { log.debug("createEvent power") - createEvent(name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W") + [ + createEvent(name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W"), + sendHubCommand(encap(zwave.meterV3.meterGet(scale: 0x00))) + ] } } } From 38bf6df2cf4add69626cc00fb8a0c1fe2b39d1cd Mon Sep 17 00:00:00 2001 From: "Marta Wierzbinska/Home IoT Development (IoT) /SRPOL/Professional/Samsung Electronics" Date: Mon, 18 Jan 2021 18:19:00 +0100 Subject: [PATCH 2/2] fix --- devicetypes/qubino/qubino-dimmer.src/qubino-dimmer.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devicetypes/qubino/qubino-dimmer.src/qubino-dimmer.groovy b/devicetypes/qubino/qubino-dimmer.src/qubino-dimmer.groovy index 3c403445164..e67a02b7856 100644 --- a/devicetypes/qubino/qubino-dimmer.src/qubino-dimmer.groovy +++ b/devicetypes/qubino/qubino-dimmer.src/qubino-dimmer.groovy @@ -354,10 +354,10 @@ def handleMeterReport(cmd) { createEvent(name: "energy", value: cmd.scaledMeterValue, unit: "kVAh") } else if (cmd.scale == 2) { log.debug("createEvent power") - [ - createEvent(name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W"), + if (isDINDimmer()) { sendHubCommand(encap(zwave.meterV3.meterGet(scale: 0x00))) - ] + } + createEvent(name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W") } } }