From fa811a39a21fa96576fb4501aa6be1d8df4a8c48 Mon Sep 17 00:00:00 2001 From: m2049r Date: Sat, 13 Jul 2019 11:55:07 +0200 Subject: [PATCH] accept Nano X over USB --- .../btchip/comm/android/BTChipTransportAndroidHID.java | 10 +++++++--- app/src/main/res/xml/usb_device_filter.xml | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java b/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java index e4cbd43..05df907 100644 --- a/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java +++ b/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java @@ -46,8 +46,12 @@ public class BTChipTransportAndroidHID implements BTChipTransport { HashMap deviceList = manager.getDeviceList(); for (UsbDevice device : deviceList.values()) { Timber.d("%04X:%04X %s, %s", device.getVendorId(), device.getProductId(), device.getManufacturerName(), device.getProductName()); - if ((device.getVendorId() == VID) && (device.getProductId() == PID_HID)) { - return device; + if (device.getVendorId() == VID) { + final int deviceProductId = device.getProductId(); + for (int pid : PID_HIDS) { + if (deviceProductId == pid) + return device; + } } } return null; @@ -74,7 +78,7 @@ public class BTChipTransportAndroidHID implements BTChipTransport { } private static final int VID = 0x2C97; - private static final int PID_HID = 0x0001; + private static final int[] PID_HIDS = {0x0001, 0x0004}; private UsbDeviceConnection connection; private UsbInterface dongleInterface; diff --git a/app/src/main/res/xml/usb_device_filter.xml b/app/src/main/res/xml/usb_device_filter.xml index 2fc6025..ee5e64b 100644 --- a/app/src/main/res/xml/usb_device_filter.xml +++ b/app/src/main/res/xml/usb_device_filter.xml @@ -6,4 +6,9 @@ product-id="1" vendor-id="11415" /> + + + \ No newline at end of file