flywithu/usb-serial-for-android
1
0
Fork 0
mirror of https://github.com/mik3y/usb-serial-for-android synced 2025-06-08 00:16:13 +00:00
Code Issues Releases Wiki Activity

implement CH34x input control lines

Browse Source
This commit is contained in:
kai-morich 2020-06-27 11:53:12 +02:00
parent 06d1041738
commit 13df128226
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/DeviceTest.java
View File

@ -1560,6 +1560,9 @@ public class DeviceTest implements SerialInputOutputManager.Listener {
} else if (usbSerialDriver instanceof ProlificSerialDriver) { } else if (usbSerialDriver instanceof ProlificSerialDriver) {
inputLinesSupported = true; inputLinesSupported = true;
inputLinesConnected = true; inputLinesConnected = true;
} else if (usbSerialDriver instanceof Ch34xSerialDriver) {
inputLinesSupported = true;
inputLinesConnected = true;
} }
usbOpen(EnumSet.of(UsbOpenFlags.NO_CONTROL_LINE_INIT)); usbOpen(EnumSet.of(UsbOpenFlags.NO_CONTROL_LINE_INIT));

35
usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Ch34xSerialDriver.java
View File

@ -56,6 +56,13 @@ public class Ch34xSerialDriver implements UsbSerialDriver {
private static final int LCR_CS6 = 0x01; private static final int LCR_CS6 = 0x01;
private static final int LCR_CS5 = 0x00; private static final int LCR_CS5 = 0x00;
private static final int GCL_CTS = 0x01;
private static final int GCL_DSR = 0x02;
private static final int GCL_RI = 0x04;
private static final int GCL_CD = 0x08;
private static final int SCL_DTR = 0x20;
private static final int SCL_RTS = 0x40;
public Ch34xSerialDriver(UsbDevice device) { public Ch34xSerialDriver(UsbDevice device) {
mDevice = device; mDevice = device;
mPort = new Ch340SerialPort(mDevice, 0); mPort = new Ch340SerialPort(mDevice, 0);
@ -160,12 +167,20 @@ public class Ch34xSerialDriver implements UsbSerialDriver {
} }
} }
private void writeHandshakeByte() throws IOException { private void setControlLines() throws IOException {
if (controlOut(0xa4, ~((dtr ? 1 << 5 : 0) | (rts ? 1 << 6 : 0)), 0) < 0) { if (controlOut(0xa4, ~((dtr ? SCL_DTR : 0) | (rts ? SCL_RTS : 0)), 0) < 0) {
throw new IOException("Failed to set handshake byte"); throw new IOException("Failed to set control lines");
} }
} }
private byte getControlLines() throws IOException {
byte[] buffer = new byte[2];
int ret = controlIn(0x95, 0x0706, 0, buffer);
if (ret < 0)
throw new IOException("Error getting control lines");
return buffer[0];
}
private void initialize() throws IOException { private void initialize() throws IOException {
checkState("init #1", 0x5f, 0, new int[]{-1 /* 0x27, 0x30 */, 0x00}); checkState("init #1", 0x5f, 0, new int[]{-1 /* 0x27, 0x30 */, 0x00});
@ -189,7 +204,7 @@ public class Ch34xSerialDriver implements UsbSerialDriver {
setBaudRate(DEFAULT_BAUD_RATE); setBaudRate(DEFAULT_BAUD_RATE);
writeHandshakeByte(); setControlLines();
checkState("init #10", 0x95, 0x0706, new int[]{-1/* 0x9f, 0xff*/, -1/*0xec,0xee*/}); checkState("init #10", 0x95, 0x0706, new int[]{-1/* 0x9f, 0xff*/, -1/*0xec,0xee*/});
} }
@ -289,17 +304,17 @@ public class Ch34xSerialDriver implements UsbSerialDriver {
@Override @Override
public boolean getCD() throws IOException { public boolean getCD() throws IOException {
return false; return (getControlLines() & GCL_CD) == 0;
} }
@Override @Override
public boolean getCTS() throws IOException { public boolean getCTS() throws IOException {
return false; return (getControlLines() & GCL_CTS) == 0;
} }
@Override @Override
public boolean getDSR() throws IOException { public boolean getDSR() throws IOException {
return false; return (getControlLines() & GCL_DSR) == 0;
} }
@Override @Override
@ -310,12 +325,12 @@ public class Ch34xSerialDriver implements UsbSerialDriver {
@Override @Override
public void setDTR(boolean value) throws IOException { public void setDTR(boolean value) throws IOException {
dtr = value; dtr = value;
writeHandshakeByte(); setControlLines();
} }
@Override @Override
public boolean getRI() throws IOException { public boolean getRI() throws IOException {
return false; return (getControlLines() & GCL_RI) == 0;
} }
@Override @Override
@ -326,7 +341,7 @@ public class Ch34xSerialDriver implements UsbSerialDriver {
@Override @Override
public void setRTS(boolean value) throws IOException { public void setRTS(boolean value) throws IOException {
rts = value; rts = value;
writeHandshakeByte(); setControlLines();
} }
} }