Skip to content

Commit ad93c94

Browse files
authored
Fix minor bigs (#1426)
Signed-off-by: Chris Jackson <[email protected]>
1 parent ed73445 commit ad93c94

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

com.zsmartsystems.zigbee.dongle.xbee/src/main/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeFrameHandler.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,9 @@ private void sendNextFrame() {
375375
logger.debug("TX XBEE Data:{}", builder.toString());
376376

377377
int[] outputBuffer = new int[data.size()];
378-
for(int i = 0; i < data.size(); ++i) outputBuffer[i] = data.get(i);
378+
for (int i = 0; i < data.size(); ++i) {
379+
outputBuffer[i] = data.get(i);
380+
}
379381
serialPort.write(outputBuffer);
380382

381383
// Start the timeout
@@ -584,9 +586,9 @@ public XBeeResponse sendRequest(final XBeeCommand command) {
584586
}
585587

586588
/**
587-
* Sends a XBee request to the NCP without waiting for the response.
589+
* Waits for a reponse of the requested class
588590
*
589-
* @param command Request {@link XBeeCommand} to send
591+
* @param eventClass the class to wait for
590592
* @return response {@link Future} {@link XBeeCommand}
591593
*/
592594
private Future<XBeeEvent> waitEventAsync(final Class<?> eventClass) {

com.zsmartsystems.zigbee.dongle.xbee/src/main/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeFrame.java

-9
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,6 @@ protected String deserializeAtCommand() {
132132
return builder.toString();
133133
}
134134

135-
/**
136-
* Serializes a {@link ExtendedPanId}
137-
*
138-
* @param address the {@link ExtendedPanId}
139-
*/
140-
// protected void serializeExtendedPanId(ExtendedPanId epanId) {
141-
// serializeUpperCaseString(epanId.toString());
142-
// }
143-
144135
/**
145136
* Deserializes a {@link ExtendedPanId}
146137
*

com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/app/otaserver/ZclOtaUpgradeServer.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,8 @@ private boolean handleQueryNextImageCommand(QueryNextImageCommand command) {
739739
|| command.getHardwareVersion() > otaFile.getMaximumHardware()) {
740740
logger.debug(
741741
"{} OTA Error: Request is inconsistent with hardware - requested={}, file min={}, file max={}",
742-
command.getHardwareVersion(), otaFile.getMinimumHardware(), otaFile.getMaximumHardware());
742+
cluster.getZigBeeAddress(), command.getHardwareVersion(), otaFile.getMinimumHardware(),
743+
otaFile.getMaximumHardware());
743744
sendNoImageAvailableResponse(command);
744745
return true;
745746
}
@@ -748,7 +749,8 @@ private boolean handleQueryNextImageCommand(QueryNextImageCommand command) {
748749
// Some devices may make further requests for files once they have been updated
749750
// By default, don't resend the existing file
750751
if (!allowExistingFile && command.getFileVersion().equals(otaFile.getFileVersion())) {
751-
logger.debug("{} OTA Error: Request is for existing file version {}", command.getFileVersion());
752+
logger.debug("{} OTA Error: Request is for existing file version {}", cluster.getZigBeeAddress(),
753+
command.getFileVersion());
752754
sendNoImageAvailableResponse(command);
753755
return true;
754756
}

com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/app/seclient/SmartEnergyClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ public void nodeAdded(ZigBeeNode node) {
10311031
ZclAttribute attribute = keCluster
10321032
.getLocalAttribute(ZclKeyEstablishmentCluster.ATTR_SERVERKEYESTABLISHMENTSUITE);
10331033
if (attribute == null) {
1034-
logger.debug("{}: Unable to get ATTR_SERVERKEYESTABLISHMENTSUITE");
1034+
logger.debug("{}: Unable to get ATTR_SERVERKEYESTABLISHMENTSUITE", node.getIeeeAddress());
10351035
} else {
10361036
attribute.setValue(1);
10371037
attribute.setImplemented(true);

0 commit comments

Comments
 (0)