diff --git a/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringInstantaneousDemand.java b/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringInstantaneousDemand.java index 09b0c51ea..2b33fb762 100644 --- a/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringInstantaneousDemand.java +++ b/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringInstantaneousDemand.java @@ -158,7 +158,7 @@ public Channel getChannel(ThingUID thingUID, ZigBeeEndpoint endpoint) { @Override public void attributeUpdated(ZclAttribute attribute, Object val) { logger.debug("{}: ZigBee attribute reports {}", endpoint.getIeeeAddress(), attribute); - if (attribute.getCluster() == ZclClusterType.ELECTRICAL_MEASUREMENT + if (attribute.getCluster() == ZclClusterType.METERING && attribute.getId() == ZclMeteringCluster.ATTR_INSTANTANEOUSDEMAND) { Integer value = (Integer) val; BigDecimal valueCalibrated = BigDecimal.valueOf(value * multiplier / divisor); diff --git a/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationDelivered.java b/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationDelivered.java index 5decf73a9..7e5e5c456 100644 --- a/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationDelivered.java +++ b/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationDelivered.java @@ -157,7 +157,7 @@ public Channel getChannel(ThingUID thingUID, ZigBeeEndpoint endpoint) { @Override public void attributeUpdated(ZclAttribute attribute, Object val) { logger.debug("{}: ZigBee attribute reports {}", endpoint.getIeeeAddress(), attribute); - if (attribute.getCluster() == ZclClusterType.ELECTRICAL_MEASUREMENT + if (attribute.getCluster() == ZclClusterType.METERING && attribute.getId() == ZclMeteringCluster.ATTR_CURRENTSUMMATIONDELIVERED) { Integer value = (Integer) val; BigDecimal valueCalibrated = BigDecimal.valueOf(value * multiplier / divisor); diff --git a/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationReceived.java b/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationReceived.java index 17f9e0ef0..49a267690 100644 --- a/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationReceived.java +++ b/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationReceived.java @@ -157,7 +157,7 @@ public Channel getChannel(ThingUID thingUID, ZigBeeEndpoint endpoint) { @Override public void attributeUpdated(ZclAttribute attribute, Object val) { logger.debug("{}: ZigBee attribute reports {}", endpoint.getIeeeAddress(), attribute); - if (attribute.getCluster() == ZclClusterType.ELECTRICAL_MEASUREMENT + if (attribute.getCluster() == ZclClusterType.METERING && attribute.getId() == ZclMeteringCluster.ATTR_CURRENTSUMMATIONRECEIVED) { Integer value = (Integer) val; BigDecimal valueCalibrated = BigDecimal.valueOf(value * multiplier / divisor);