diff --git a/README.md b/README.md index f04eb8e..7d4e5af 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ a compatible UsbDevice. This library supports USB to serial converter chips: * FTDI FT232R, FT232H, FT2232H, FT4232H, FT230X, FT231X, FT234XD * Prolific PL2303 -* Silabs CP2102, CP2105, ... +* Silabs CP2102 and all other CP210x * Qinheng CH340, CH341A and devices implementing the CDC/ACM protocol like diff --git a/usbSerialExamples/src/main/res/xml/device_filter.xml b/usbSerialExamples/src/main/res/xml/device_filter.xml index e1b53da..9cdf1fa 100644 --- a/usbSerialExamples/src/main/res/xml/device_filter.xml +++ b/usbSerialExamples/src/main/res/xml/device_filter.xml @@ -8,10 +8,9 @@ - + - diff --git a/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java b/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java index f7c1d6b..a65ac5c 100644 --- a/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java +++ b/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java @@ -320,10 +320,9 @@ public class Cp21xxSerialDriver implements UsbSerialDriver { final Map supportedDevices = new LinkedHashMap(); supportedDevices.put(UsbId.VENDOR_SILABS, new int[] { - UsbId.SILABS_CP2102, + UsbId.SILABS_CP2102, // same ID for CP2101, CP2103, CP2104, CP2109 UsbId.SILABS_CP2105, UsbId.SILABS_CP2108, - UsbId.SILABS_CP2110 }); return supportedDevices; } diff --git a/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/UsbId.java b/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/UsbId.java index d066d11..60443a1 100644 --- a/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/UsbId.java +++ b/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/UsbId.java @@ -45,10 +45,9 @@ public final class UsbId { public static final int LEAFLABS_MAPLE = 0x0004; public static final int VENDOR_SILABS = 0x10c4; - public static final int SILABS_CP2102 = 0xea60; + public static final int SILABS_CP2102 = 0xea60; // same ID for CP2101, CP2103, CP2104, CP2109 public static final int SILABS_CP2105 = 0xea70; public static final int SILABS_CP2108 = 0xea71; - public static final int SILABS_CP2110 = 0xea80; public static final int VENDOR_PROLIFIC = 0x067b; public static final int PROLIFIC_PL2303 = 0x2303;