Fix checksum error in FIND_DEVICE_CONFIRM on CC2531 and improve logging (#985)

Signed-off-by: Witold Sowa <[email protected]>

Author: wsowa

com.zsmartsystems.zigbee.dongle.cc2531/src/main/java/com/zsmartsystems/zigbee/dongle/cc2531/network/packet/ZToolPacketStream.java

@@ -33,6 +33,7 @@
 package com.zsmartsystems.zigbee.dongle.cc2531.network.packet;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,8 +95,6 @@ public class ZToolPacketStream implements IIntArrayInputStream {
 
     private Checksum checksum = new Checksum();
 
-    private boolean generic = false;
-
     private final ZigBeePort port;
 
     public ZToolPacketStream(ZigBeePort port) {
@@ -108,36 +107,21 @@ public ZToolPacket parsePacket() throws IOException {
         done = false;
         bytesRead = 0;
         try {
-            final ZToolPacket response;
             // int byteLength = this.read("Length");
             this.length = read("Length");
             // log.debug("data length is " + ByteUtils.formatByte(length.getLength()));
-            final int[] frameData;
             final int apiIdMSB = this.read("API PROFILE_ID_HOME_AUTOMATION MSB");
             final int apiIdLSB = this.read("API PROFILE_ID_HOME_AUTOMATION LSB");
             final DoubleByte apiId = new DoubleByte(apiIdMSB, apiIdLSB);
-            // TODO Remove generic never used
-            // generic = true;
-            if (generic) {
-                // log.info("Parsing data as generic");
-                int i = 0;
-                frameData = new int[length];
-                // Read all data bytes without parsing
-                while (i < frameData.length) {
-                    frameData[i] = this.read("Data " + i + "-th");
-                    i++;
-                }
-
-                response = new ZToolPacket(apiId, frameData);
-            } else {
-                frameData = this.readRemainingBytes();
-                response = parsePayload(apiId, frameData);
-            }
+            final int[] frameData = this.readRemainingBytes();
+            final ZToolPacket response = parsePayload(apiId, frameData);
+
             // response.setFCS(this.read("Checksum"));
             int fcs = this.read("Checksum");
             // setDone(true);
             if (fcs != response.getFCS()) {
-                // log.debug("Checksum of packet failed: received =" + fcs + " expected = " + response.getFCS());
+                logger.error("Checksum of packet failed: received =" + fcs + " expected = " + response.getFCS() +
+                        ". Len = " + this.length + ", ApiId = " + apiId + ", Packet = " + Arrays.toString(frameData));
                 throw new ZToolParseException("Packet checksum failed");
             }
             if (!this.isDone()) {

com.zsmartsystems.zigbee.dongle.cc2531/src/main/java/com/zsmartsystems/zigbee/dongle/cc2531/network/packet/simple/ZB_FIND_DEVICE_CONFIRM.java

@@ -30,6 +30,7 @@
 
 package com.zsmartsystems.zigbee.dongle.cc2531.network.packet.simple;
 
+import com.zsmartsystems.zigbee.dongle.cc2531.network.packet.ZToolCMD;
 import com.zsmartsystems.zigbee.dongle.cc2531.network.packet.ZToolPacket;
 import com.zsmartsystems.zigbee.dongle.cc2531.zigbee.util.DoubleByte;
 
@@ -62,6 +63,7 @@ public ZB_FIND_DEVICE_CONFIRM(int[] framedata) {
         for (int i = 0; i < 8; i++) {
             this.Result[i] = framedata[i + 3];
         }
+        super.buildPacket(new DoubleByte(ZToolCMD.ZB_FIND_DEVICE_CONFIRM), framedata);
     }
 
 }

com.zsmartsystems.zigbee.serial/src/main/java/com/zsmartsystems/zigbee/serial/ZigBeeSerialPort.java

@@ -225,6 +225,7 @@ public void serialEvent(SerialPortEvent event) {
             try {
                 int[] input = serialPort.readIntArray();
                 if (input == null) {
+                    logger.warn("Nothing read from serial port.");
                     return;
                 }
 
@@ -234,15 +235,21 @@ public void serialEvent(SerialPortEvent event) {
                         if (end >= maxLength) {
                             end = 0;
                         }
+                        if (end == start) {
+                            logger.warn("Serial buffer overrun.");
+                            if (++start == maxLength) {
+                                start = 0;
+                            }
+                        }
                     }
                 }
-
-                synchronized (this) {
-                    this.notify();
-                }
             } catch (SerialPortException e) {
                 logger.error("Error while handling serial event.", e);
             }
+
+            synchronized (this) {
+                this.notify();
+            }
         }
     }