Fix cluster definition for metering channels (#663)

Signed-off-by: Chris Jackson <chris@cd-jackson.com>
openhab · Jul 27, 2021 · 742a2d0 · 742a2d0
1 parent e37331b
commit 742a2d0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringInstantaneousDemand.java b/...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/.../openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationDelivered.java b/.../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/...g/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationReceived.java b/...g/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);