HEX prefix '0x' added to thing's versions. (#384)

HEX prefix '0x' added to thing's versions. This change is needed in order ESH firmware update mechanism to be able to distinguish between HEX and DEC version formats. Signed-off-by: YordanDZhelev <[email protected]>
openhab · Feb 21, 2019 · c3c9e08 · c3c9e08
1 parent 282f924
commit c3c9e08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/...enhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/ZigBeeBindingConstants.java b/...enhab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/ZigBeeBindingConstants.java
@@ -245,6 +245,7 @@ public class ZigBeeBindingConstants {
     public static final String OFFLINE_DISCOVERY_INCOMPLETE = "@text/zigbee.status.offline_discoveryincomplete";
 
     public static final String FIRMWARE_FAILED = "@text/zigbee.firmware.failed";
+    public static final String FIRMWARE_VERSION_HEX_PREFIX = "0x";
 
     // List of channel state constants
     public static final String STATE_OPTION_BATTERY_MIN_THRESHOLD = "minThreshold";

diff --git a/...gbee/src/main/java/org/openhab/binding/zigbee/discovery/ZigBeeNodePropertyDiscoverer.java b/...gbee/src/main/java/org/openhab/binding/zigbee/discovery/ZigBeeNodePropertyDiscoverer.java
@@ -185,7 +185,8 @@ public Map<String, String> getProperties(final ZigBeeNode node) {
         if (otaCluster != null) {
             Integer fileVersion = otaCluster.getCurrentFileVersion(Long.MAX_VALUE);
             if (fileVersion != null) {
-                properties.put(Thing.PROPERTY_FIRMWARE_VERSION, String.format("%08X", fileVersion));
+                properties.put(Thing.PROPERTY_FIRMWARE_VERSION,
+                        String.format("%s%08X", ZigBeeBindingConstants.FIRMWARE_VERSION_HEX_PREFIX, fileVersion));
             } else {
                 logger.debug("{}: OTA firmware failed", node.getIeeeAddress());
             }

diff --git a/...b.binding.zigbee/src/main/java/org/openhab/binding/zigbee/handler/ZigBeeThingHandler.java b/...b.binding.zigbee/src/main/java/org/openhab/binding/zigbee/handler/ZigBeeThingHandler.java
@@ -884,7 +884,8 @@ public void otaStatusUpdate(ZigBeeOtaServerStatus status, int percent) {
                 for (int retry = 0; retry < 3; retry++) {
                     Integer fileVersion = finalOtaServer.getCurrentFileVersion();
                     if (fileVersion != null) {
-                        updateProperty(Thing.PROPERTY_FIRMWARE_VERSION, String.format("%08X", fileVersion));
+                        updateProperty(Thing.PROPERTY_FIRMWARE_VERSION, String.format("%s%08X",
+                                ZigBeeBindingConstants.FIRMWARE_VERSION_HEX_PREFIX, fileVersion));
                         break;
                     } else {
                         logger.debug("{}: OTA firmware request timeout (retry {})", node.getIeeeAddress(), retry);