back to previous ftdi syncRead method

tracmap · Jul 3, 2019 · 9f32a3b · 9f32a3b
1 parent 3465c50
commit 9f32a3b
Showing 1 changed file with 25 additions and 5 deletions.
diff --git a/usbserial/src/main/java/com/felhr/usbserial/FTDISerialDevice.java b/usbserial/src/main/java/com/felhr/usbserial/FTDISerialDevice.java
@@ -537,6 +537,30 @@ private static void copyData(byte[] src, byte[] dst)
 
     public class FTDIUtilities
     {
+        // Special treatment needed to FTDI devices
+        public byte[] adaptArray(byte[] ftdiData)
+        {
+            int length = ftdiData.length;
+            if(length > 64)
+            {
+                int n = 1;
+                int p = 64;
+                // Precalculate length without FTDI headers
+                while(p < length)
+                {
+                    n++;
+                    p = n*64;
+                }
+                int realLength = length - n*2;
+                byte[] data = new byte[realLength];
+                copyData(ftdiData, data);
+                return data;
+            }else
+            {
+                return Arrays.copyOfRange(ftdiData, 2, length);
+            }
+        }
+
         public void checkModemStatus(byte[] data)
         {
             if(data.length == 0) // Safeguard for zero length arrays
@@ -624,10 +648,6 @@ public int syncRead(byte[] buffer, int timeout)
             return 0;
         }
 
-        if (mr1Version) {
-            return readSyncJelly(buffer, timeout, stopTime);
-        }
-
         int n = buffer.length / 62;
         if(buffer.length % 62 != 0)
         {
@@ -654,7 +674,7 @@ public int syncRead(byte[] buffer, int timeout)
 
             if(numberBytes > 2) // Data received
             {
-                byte[] newBuffer = adaptArray(tempBuffer);
+                byte[] newBuffer = this.ftdiUtilities.adaptArray(tempBuffer);
                 System.arraycopy(newBuffer, 0, buffer, 0, buffer.length);
 
                 int p = numberBytes / 64;