From 1dbe983cc7f3b3aa335f75efe91d366c3da8f309 Mon Sep 17 00:00:00 2001 From: Felipe Herranz Date: Thu, 29 May 2014 13:03:42 +0200 Subject: [PATCH] minor fix in ftdi data stream --- .../UsbSerialDevice$WorkerThread.class | Bin 2739 -> 2776 bytes .../UsbSerialDevice$WriteThread.class | Bin 1513 -> 1513 bytes .../com/felhr/usbserial/UsbSerialDevice.class | Bin 3871 -> 3871 bytes bin/usbserial.jar | Bin 27547 -> 27575 bytes src/com/felhr/usbserial/UsbSerialDevice.java | 17 ++++++++++++----- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/classes/com/felhr/usbserial/UsbSerialDevice$WorkerThread.class b/bin/classes/com/felhr/usbserial/UsbSerialDevice$WorkerThread.class index 31d577cbc36d91faa393d55761678974d04ecd7d..1ad0819c010a0a91ace47dbc248d5c700f539c08 100644 GIT binary patch delta 304 zcmXAjJxc>&5QLxed`a$#Gm0S~8e^s0C0dAu5JUtO;s=5j25dbQD}x^am7Jg;rcijb zNTUG*X$^)mm8HMI)}LV^xOyxMGqc0&z9v7DFK*m7QkXJOZ4$U`5^Y98Mwh)04!n?D z$fT;{M|8TEpiVK0u*D@lSL|~wPKg_;l7~$6Hfe@MIkMR%jv*aO zlHZ|=UGWoin?G#E7>~u+bH3@6}3)+bdgZ6;yDjz=+^xqdZU$_us9(buzBo$(R2gy0VOrU z59@AIsKu<2f}ol)+asbjouJP&Kgt diff --git a/bin/classes/com/felhr/usbserial/UsbSerialDevice$WriteThread.class b/bin/classes/com/felhr/usbserial/UsbSerialDevice$WriteThread.class index c06808e8a72b26187e150306d35cbd38d53ccbb6..1c0341313bb3a9144f4f1aa0c8f0f007e28e48ed 100644 GIT binary patch delta 67 zcmV-J0KEU{3+W56l>`l~00jW700{uD02KhQlcEG=5wrjU0JZ=Q0Ji`m0JH!t0J)PG Z1yKdP00jWPlWqk{1;PLb0K=2L1uTWH5}yD7 delta 67 zcmV-J0KEU{3+W56l>`l@00jW000{u602KhJlcEG=5v>3N0IvWJ0I&cf0IdKm0J4)9 Z1yKdI00jWIlWqk{1-k$U0KAjE1uS|H5<~z1 diff --git a/bin/classes/com/felhr/usbserial/UsbSerialDevice.class b/bin/classes/com/felhr/usbserial/UsbSerialDevice.class index 7d9934a700274fbf8ee37e51e21a13372693d21b..33b862b6e801b5041f0de159cac15891acf53107 100644 GIT binary patch delta 91 zcmbO)H(zc;953%_26l$C415gd7=#%vOwQ(w=DiLSxe4UmVvu6EGufU`Zt_Q7TfqlF l(MLdakAX5zfHKd3GSR%RfTC}JB5#2r?|~xHlMnI50sy!P8ifD= delta 91 zcmbO)H(zc;953$?26l#H415g78H5>5PR{0y=Dh$Exdh~0W{_gII@z92Zt_Q7Tfv(^ l(c3_EcYrc?fim}jGSR$`fuc`=BF}&#FMuM_lMnI50sx}C8V&#e diff --git a/bin/usbserial.jar b/bin/usbserial.jar index 7a59b06b14270781fd97d562437e3ddbdfed8ae8..2e0d6d1eed3c08d77109ca4ec187d199a54fc159 100644 GIT binary patch delta 4229 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 delta 4246 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 EAF~YfW&i*H diff --git a/src/com/felhr/usbserial/UsbSerialDevice.java b/src/com/felhr/usbserial/UsbSerialDevice.java index f7b3c43..df113f9 100644 --- a/src/com/felhr/usbserial/UsbSerialDevice.java +++ b/src/com/felhr/usbserial/UsbSerialDevice.java @@ -120,12 +120,19 @@ public abstract class UsbSerialDevice implements UsbSerialInterface byte[] data = serialBuffer.getDataReceived(); // FTDI devices reserves two first bytes of an IN endpoint with info about // modem and Line. - if(isFTDIDevice()) + if(isFTDIDevice() && data.length > 2) + { data = FTDISerialDevice.FTDIUtilities.adaptArray(data); - - // Clear buffer, execute the callback and queue another request - serialBuffer.clearReadBuffer(); - onReceivedData(data); + // Clear buffer, execute the callback + serialBuffer.clearReadBuffer(); + onReceivedData(data); + }else + { + // Clear buffer, execute the callback + serialBuffer.clearReadBuffer(); + onReceivedData(data); + } + // Queue a new request requestIN.queue(serialBuffer.getReadBuffer(), SerialBuffer.DEFAULT_READ_BUFFER_SIZE); } }