Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cluster definition for electrical metering channels #663

Merged
merged 1 commit into from
Jul 27, 2021
Merged

Fix cluster definition for electrical metering channels #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringInstantaneousDemand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion .../openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationDelivered.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...g/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeteringSummationReceived.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down