Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change a single hardcoded FTDI USB Product ID to a list. #126

Merged
merged 1 commit into from
Sep 10, 2018
Merged

Change a single hardcoded FTDI USB Product ID to a list. #126

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
23 changes: 19 additions & 4 deletions library/src/main/java/com/digi/xbee/api/connection/android/AndroidXBeeInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,15 @@ public class AndroidXBeeInterface implements IConnectionInterface {

// Constants.
private static final int VID = 0x0403;
private static final int PID = 0x6001;
private static final int[] FTDI_PIDS = {
0x6001, // FT232 and FT245
//0x6010, // FT2232
//0x6011, // FT4232
//0x6014, // FT232H
0x6015, // FT-X series
//0x601C, //FT4222H
};

private static final int BASE_CLOCK = 48000000;

private static final String ACTION_USB_PERMISSION = "com.android.example.USB_PERMISSION";
Expand Down Expand Up @@ -387,9 +395,16 @@ private UsbDevice findDevice() {
UsbDevice usbDevice = null;
HashMap<String, UsbDevice> deviceList = usbManager.getDeviceList();
for (UsbDevice device:deviceList.values()) {
if ((device.getProductId() == PID) && (device.getVendorId() == VID)) {
usbDevice = device;
logger.info("USB XBee Android device found: " + usbDevice.getDeviceName());
if (device.getVendorId() == VID) {
for (int pid:FTDI_PIDS) {
if (device.getProductId() == pid) {
usbDevice = device;
logger.info("USB XBee Android device found: " + usbDevice.getDeviceName());
break;
}
}
}
if (usbDevice != null) {
break;
}
}
Expand Down