Still not tested but moved

felHR85 · May 27, 2014 · a53e715 · a53e715
1 parent 51f647e
commit a53e715
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 51 deletions.
diff --git a/bin/classes/com/felhr/usbserial/FTDISerialDevice$FTDIUtilities.class b/bin/classes/com/felhr/usbserial/FTDISerialDevice$FTDIUtilities.class
diff --git a/bin/classes/com/felhr/usbserial/FTDISerialDevice.class b/bin/classes/com/felhr/usbserial/FTDISerialDevice.class
diff --git a/bin/classes/com/felhr/usbserial/UsbSerialDevice$WorkerThread.class b/bin/classes/com/felhr/usbserial/UsbSerialDevice$WorkerThread.class
diff --git a/bin/classes/com/felhr/usbserial/UsbSerialDevice$WriteThread.class b/bin/classes/com/felhr/usbserial/UsbSerialDevice$WriteThread.class
diff --git a/bin/classes/com/felhr/usbserial/UsbSerialDevice.class b/bin/classes/com/felhr/usbserial/UsbSerialDevice.class
diff --git a/bin/usbserial.jar b/bin/usbserial.jar
diff --git a/src/com/felhr/usbserial/FTDISerialDevice.java b/src/com/felhr/usbserial/FTDISerialDevice.java
@@ -1,5 +1,7 @@
 package com.felhr.usbserial;
 
+import java.util.Arrays;
+
 import android.hardware.usb.UsbConstants;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbDeviceConnection;
@@ -277,5 +279,57 @@ private int setControlCommand(int request, int value, int index, byte[] data)
 		Log.i(CLASS_ID,"Control Transfer Response: " + String.valueOf(response));
 		return response;
 	}
+
+	public static class FTDIUtilities
+	{
+		// Special treatment needed to FTDI devices
+		public static 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);
+			}	
+		}
+
+		// Copy data without FTDI headers
+		private static void copyData(byte[] src, byte[] dst)
+		{
+			int i = 0; // src index
+			int j = 0; // dst index
+			while(i <= src.length-1)
+			{
+				if(i != 0 || i != 1)
+				{
+					if(i % 64 == 0 && i >= 64)
+					{
+						i += 2;
+					}else
+					{
+						dst[j] = src[i];
+						i++;
+						j++;
+					}	
+				}else
+				{
+					i++;
+				}
+			}
+		}
+	}
 
 }
diff --git a/src/com/felhr/usbserial/UsbSerialDevice.java b/src/com/felhr/usbserial/UsbSerialDevice.java
@@ -102,7 +102,7 @@ public void run()
 					if(isFTDIDevice())
 					{
 						Log.i(CLASS_ID, String.valueOf(data.length));
-						byte[] data2 = adaptArray(data);
+						byte[] data2 = FTDISerialDevice.FTDIUtilities.adaptArray(data);
 						// Clear buffer and execute the callback
 						serialBuffer.clearReadBuffer();
 						onReceivedData(data2);
@@ -143,56 +143,6 @@ public void stopWorkingThread()
 		{
 			working.set(false);
 		}
-
-		// Special treatment needed to FTDI devices
-		private 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);
-			}	
-		}
-
-		// Copy data without FTDI headers
-		private void copyData(byte[] src, byte[] dst)
-		{
-			int i = 0; // src index
-			int j = 0; // dst index
-		    while(i <= src.length-1)
-		    {
-		    	if(i != 0 || i != 1)
-		    	{
-		    		if(i % 64 == 0 && i >= 64)
-		    		{
-		    			i += 2;
-		    		}else
-		    		{
-		    			dst[j] = src[i];
-		    			i++;
-			    		j++;
-		    		}	
-		    	}else
-		    	{
-		    		i++;
-		    	}
-		    }
-		}
-
 	}
 
 	protected class WriteThread extends Thread