Fix minor bigs (#1426)

Signed-off-by: Chris Jackson <[email protected]>
zsmartsystems · May 18, 2024 · ad93c94 · ad93c94
1 parent ed73445
commit ad93c94
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/...le.xbee/src/main/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeFrameHandler.java b/...le.xbee/src/main/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeFrameHandler.java
@@ -375,7 +375,9 @@ private void sendNextFrame() {
             logger.debug("TX XBEE Data:{}", builder.toString());
 
             int[] outputBuffer = new int[data.size()];
-            for(int i = 0; i < data.size(); ++i) outputBuffer[i] = data.get(i);
+            for (int i = 0; i < data.size(); ++i) {
+                outputBuffer[i] = data.get(i);
+            }
             serialPort.write(outputBuffer);
 
             // Start the timeout
@@ -584,9 +586,9 @@ public XBeeResponse sendRequest(final XBeeCommand command) {
     }
 
     /**
-     * Sends a XBee request to the NCP without waiting for the response.
+     * Waits for a reponse of the requested class
      *
-     * @param command Request {@link XBeeCommand} to send
+     * @param eventClass the class to wait for
      * @return response {@link Future} {@link XBeeCommand}
      */
     private Future<XBeeEvent> waitEventAsync(final Class<?> eventClass) {

diff --git a/....xbee/src/main/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeFrame.java b/....xbee/src/main/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeFrame.java
@@ -132,15 +132,6 @@ protected String deserializeAtCommand() {
         return builder.toString();
     }
 
-    /**
-     * Serializes a {@link ExtendedPanId}
-     *
-     * @param address the {@link ExtendedPanId}
-     */
-    // protected void serializeExtendedPanId(ExtendedPanId epanId) {
-    // serializeUpperCaseString(epanId.toString());
-    // }
-
     /**
      * Deserializes a {@link ExtendedPanId}
      *

diff --git a/...tems.zigbee/src/main/java/com/zsmartsystems/zigbee/app/otaserver/ZclOtaUpgradeServer.java b/...tems.zigbee/src/main/java/com/zsmartsystems/zigbee/app/otaserver/ZclOtaUpgradeServer.java
@@ -739,7 +739,8 @@ private boolean handleQueryNextImageCommand(QueryNextImageCommand command) {
                     || command.getHardwareVersion() > otaFile.getMaximumHardware()) {
                 logger.debug(
                         "{} OTA Error: Request is inconsistent with hardware - requested={}, file min={}, file max={}",
-                        command.getHardwareVersion(), otaFile.getMinimumHardware(), otaFile.getMaximumHardware());
+                        cluster.getZigBeeAddress(), command.getHardwareVersion(), otaFile.getMinimumHardware(),
+                        otaFile.getMaximumHardware());
                 sendNoImageAvailableResponse(command);
                 return true;
             }
@@ -748,7 +749,8 @@ private boolean handleQueryNextImageCommand(QueryNextImageCommand command) {
         // Some devices may make further requests for files once they have been updated
         // By default, don't resend the existing file
         if (!allowExistingFile && command.getFileVersion().equals(otaFile.getFileVersion())) {
-            logger.debug("{} OTA Error: Request is for existing file version {}", command.getFileVersion());
+            logger.debug("{} OTA Error: Request is for existing file version {}", cluster.getZigBeeAddress(),
+                    command.getFileVersion());
             sendNoImageAvailableResponse(command);
             return true;
         }

diff --git a/...systems.zigbee/src/main/java/com/zsmartsystems/zigbee/app/seclient/SmartEnergyClient.java b/...systems.zigbee/src/main/java/com/zsmartsystems/zigbee/app/seclient/SmartEnergyClient.java
@@ -1031,7 +1031,7 @@ public void nodeAdded(ZigBeeNode node) {
                     ZclAttribute attribute = keCluster
                             .getLocalAttribute(ZclKeyEstablishmentCluster.ATTR_SERVERKEYESTABLISHMENTSUITE);
                     if (attribute == null) {
-                        logger.debug("{}: Unable to get ATTR_SERVERKEYESTABLISHMENTSUITE");
+                        logger.debug("{}: Unable to get ATTR_SERVERKEYESTABLISHMENTSUITE", node.getIeeeAddress());
                     } else {
                         attribute.setValue(1);
                         attribute.setImplemented(true);