FTDI driver tested

felHR85 · May 28, 2014 · 8932506 · 8932506
1 parent a53e715
commit 8932506
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 17 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/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
@@ -313,10 +313,10 @@ private static void copyData(byte[] src, byte[] dst)
 			int j = 0; // dst index
 			while(i <= src.length-1)
 			{
-				if(i != 0 || i != 1)
+				if(i != 0 && i != 1)
 				{
 					if(i % 64 == 0 && i >= 64)
-					{
+					{ 
 						i += 2;
 					}else
 					{

diff --git a/src/com/felhr/usbserial/UsbSerialDevice.java b/src/com/felhr/usbserial/UsbSerialDevice.java
@@ -100,21 +100,12 @@ public void run()
 					// FTDI devices reserves two first bytes of an IN endpoint with info about
 					// modem and Line.
 					if(isFTDIDevice())
-					{
-						Log.i(CLASS_ID, String.valueOf(data.length));
-						byte[] data2 = FTDISerialDevice.FTDIUtilities.adaptArray(data);
-						// Clear buffer and execute the callback
-						serialBuffer.clearReadBuffer();
-						onReceivedData(data2);
-						requestIN.queue(serialBuffer.getReadBuffer(), SerialBuffer.DEFAULT_READ_BUFFER_SIZE);
-
-					}else
-					{
-						// Clear buffer and execute the callback
-						serialBuffer.clearReadBuffer();
-						onReceivedData(data);
-						requestIN.queue(serialBuffer.getReadBuffer(), SerialBuffer.DEFAULT_READ_BUFFER_SIZE);
-					}
+						data = FTDISerialDevice.FTDIUtilities.adaptArray(data);
+
+					// Clear buffer, execute the callback and queue another request
+					serialBuffer.clearReadBuffer();
+					onReceivedData(data);
+					requestIN.queue(serialBuffer.getReadBuffer(), SerialBuffer.DEFAULT_READ_BUFFER_SIZE);
 				}
 			}
 		}