Skip to content
This repository has been archived by the owner on Sep 5, 2019. It is now read-only.

Fix and improvements for Arduino Uno #4

Merged
merged 1 commit into from
Dec 8, 2015
Merged

Fix and improvements for Arduino Uno #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion physicaloid/src/main/java/com/physicaloid/lib/programmer/avr/Stk500.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ private int drain() {
}
}
endTime = System.currentTimeMillis();
if ((endTime - startTime) > 1000) {
if ((endTime - startTime) > 400) {
break;
}
}
Expand Down
4 changes: 3 additions & 1 deletion physicaloid/src/main/java/com/physicaloid/lib/usb/UsbCdcConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ public boolean open(UsbVidPid ids, boolean isCdcAcm, int ch) {
Log.d(TAG, "Find VID:" + Integer.toHexString(usbdev.getVendorId()) + ", PID:" + Integer.toHexString(usbdev.getProductId()) + ", DevNum:" + devNum + ", IntfNum:" + intfNum);
}
mUsbConnectionEp.put(ch, new UsbCdcConnectionEp(mUsbAccess.connection(ch), getEndpoint(devNum, intfNum, UsbConstants.USB_DIR_IN), getEndpoint(devNum, intfNum, UsbConstants.USB_DIR_OUT)));
mCdcAcmInterfaceNum = intfNum;
mCdcAcmInterfaceNum = intfNum - 1;
if (mCdcAcmInterfaceNum < 0)
mCdcAcmInterfaceNum = 0;
return true;
}
}
Expand Down
80 changes: 65 additions & 15 deletions physicaloid/src/main/java/com/physicaloid/lib/usb/driver/uart/UartCdcAcm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,15 @@ public class UartCdcAcm extends SerialCommunicator {
private static final boolean DEBUG_SHOW = false && BuildConfig.DEBUG;
private static final int DEFAULT_BAUDRATE = 9600;

private UsbCdcConnection mUsbConnetionManager;
private UsbCdcConnection mUsbConnectionManager;

private UartConfig mUartConfig;
private static final int RING_BUFFER_SIZE = 1024;
private static final int RING_BUFFER_SIZE = 4096;
private static final int USB_READ_BUFFER_SIZE = 256;
private static final int USB_WRITE_BUFFER_SIZE = 256;
private RingBuffer mBuffer;
private byte[] wBuffer = new byte[USB_WRITE_BUFFER_SIZE];
private int wLen = 0;

private boolean mReadThreadStop = true;

Expand All @@ -56,7 +58,7 @@ public class UartCdcAcm extends SerialCommunicator {

public UartCdcAcm(Context context) {
super(context);
mUsbConnetionManager = new UsbCdcConnection(context);
mUsbConnectionManager = new UsbCdcConnection(context);
mUartConfig = new UartConfig();
mBuffer = new RingBuffer(RING_BUFFER_SIZE);
isOpened = false;
Expand All @@ -73,11 +75,11 @@ public boolean open() {
}

public boolean open(UsbVidPid ids) {
if (mUsbConnetionManager.open(ids, true)) {
mConnection = mUsbConnetionManager.getConnection();
mEndpointIn = mUsbConnetionManager.getEndpointIn();
mEndpointOut = mUsbConnetionManager.getEndpointOut();
mInterfaceNum = mUsbConnetionManager.getCdcAcmInterfaceNum();
if (mUsbConnectionManager.open(ids, true)) {
mConnection = mUsbConnectionManager.getConnection();
mEndpointIn = mUsbConnectionManager.getEndpointIn();
mEndpointOut = mUsbConnectionManager.getEndpointOut();
mInterfaceNum = mUsbConnectionManager.getCdcAcmInterfaceNum();
if (!init()) {
return false;
}
Expand All @@ -96,20 +98,44 @@ public boolean open(UsbVidPid ids) {
public boolean close() {
stopRead();
isOpened = false;
return mUsbConnetionManager.close();
return mUsbConnectionManager.close();
}

@Override
public int read(byte[] buf, int size) {
return mBuffer.get(buf, size);
int r;

synchronized (mBuffer) {
r = mBuffer.get(buf, size);
}
return r;
}

@Override
public int write(byte[] buf, int size) {
if (buf == null) {
return 0;
}
int offset = 0;

if (size + wLen < USB_WRITE_BUFFER_SIZE) {
synchronized (wBuffer) {
System.arraycopy(buf, 0, wBuffer, wLen, size);
wLen += size;
}
return size;
}

int r;
int offset;
synchronized (wBuffer) {
System.arraycopy(buf, 0, wBuffer, wLen, USB_WRITE_BUFFER_SIZE - wLen);
offset = USB_WRITE_BUFFER_SIZE - wLen;
r = mConnection.bulkTransfer(mEndpointOut, wBuffer, USB_WRITE_BUFFER_SIZE, 100);
wLen = 0;
}
if (r < 0)
return -1;

int write_size;
int written_size;
byte[] wbuf = new byte[USB_WRITE_BUFFER_SIZE];
Expand Down Expand Up @@ -141,13 +167,16 @@ private void startRead() {
if (mReadThreadStop) {
mReadThreadStop = false;
new Thread(mLoop).start();
new Thread(wLoop).start();
}
}

private Runnable mLoop = new Runnable() {
@Override
public void run() {
int len = 0;
int total = 0;
boolean shouldNotify = false;
byte[] rbuf = new byte[USB_READ_BUFFER_SIZE];
for (; ; ) {// this is the main loop for transferring

Expand All @@ -159,19 +188,38 @@ public void run() {
}

if (len > 0) {
mBuffer.add(rbuf, len);
onRead(len);
synchronized (mBuffer) {
mBuffer.add(rbuf, len);
}
shouldNotify = true;
total += len;
}
if ((len <= 0 && shouldNotify) || len >= 256) {
onRead(total);
total = 0;
shouldNotify = false;
}

if (mReadThreadStop) {
return;
}
}
} // end of run()
}; // end of runnable

private Runnable wLoop = new Runnable() {
@Override
public void run() {
while (!mReadThreadStop) {// this is the main loop for transferring
synchronized (wBuffer) { // Send data in write buffer
mConnection.bulkTransfer(mEndpointOut, wBuffer, wLen, 100);
wLen = 0;
}
try {
Thread.sleep(50);
Thread.sleep(10);
} catch (InterruptedException e) {
}

}
} // end of run()
}; // end of runnable
Expand Down Expand Up @@ -363,7 +411,9 @@ public boolean getRts() {

@Override
public void clearBuffer() {
mBuffer.clear();
synchronized (mBuffer) {
mBuffer.clear();
}
}

//////////////////////////////////////////////////////////
Expand Down