From 30e60c56db1986f75e6482ac02ef5d438e7c1216 Mon Sep 17 00:00:00 2001 From: Chris Jackson Date: Mon, 20 Nov 2023 10:54:20 +1300 Subject: [PATCH] Remove deprecations from battery voltage converter (#814) Signed-off-by: Chris Jackson --- .../converter/ZigBeeConverterBatteryVoltage.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBatteryVoltage.java b/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBatteryVoltage.java index 14f80182b..95daca370 100644 --- a/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBatteryVoltage.java +++ b/org.openhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBatteryVoltage.java @@ -47,6 +47,7 @@ public class ZigBeeConverterBatteryVoltage extends ZigBeeBaseChannelConverter im private Logger logger = LoggerFactory.getLogger(ZigBeeConverterBatteryVoltage.class); private ZclPowerConfigurationCluster cluster; + private ZclAttribute attribute; @Override public Set getImplementedClientClusters() { @@ -74,8 +75,7 @@ public boolean initializeDevice() { if (bindResponse.isSuccess()) { ZclAttribute attribute = serverCluster.getAttribute(ZclPowerConfigurationCluster.ATTR_BATTERYVOLTAGE); // Configure reporting - no faster than once per ten minutes - no slower than every 2 hours. - CommandResult reportingResponse = serverCluster - .setReporting(attribute, 600, REPORTING_PERIOD_DEFAULT_MAX, 1).get(); + CommandResult reportingResponse = attribute.setReporting(600, REPORTING_PERIOD_DEFAULT_MAX, 1).get(); handleReportingResponse(reportingResponse, POLLING_PERIOD_HIGH, REPORTING_PERIOD_DEFAULT_MAX); } } catch (InterruptedException | ExecutionException e) { @@ -94,6 +94,8 @@ public boolean initializeConverter(ZigBeeThingHandler thing) { return false; } + attribute = cluster.getAttribute(ZclPowerConfigurationCluster.ATTR_BATTERYVOLTAGE); + // Add a listener, then request the status cluster.addAttributeListener(this); return true; @@ -108,7 +110,7 @@ public void disposeConverter() { @Override public void handleRefresh() { - cluster.getBatteryVoltage(0); + attribute.readValue(0); } @Override @@ -120,7 +122,8 @@ public Channel getChannel(ThingUID thingUID, ZigBeeEndpoint endpoint) { return null; } - if (powerCluster.getBatteryVoltage(Long.MAX_VALUE) == null) { + ZclAttribute attribute = cluster.getAttribute(ZclPowerConfigurationCluster.ATTR_BATTERYVOLTAGE); + if (attribute.readValue(Long.MAX_VALUE) == null) { logger.trace("{}: Power configuration cluster battery voltage returned null", endpoint.getIeeeAddress()); return null; }