From 2062e2ee19974204cac95248223ed65a2695f75f Mon Sep 17 00:00:00 2001
From: sh123 <sh123@users.noreply.github.com>
Date: Mon, 13 Mar 2023 22:11:17 +0200
Subject: [PATCH] More supported USB devices

---
 codec2talkie/build.gradle                           |  4 ++--
 .../codec2talkie/connect/UsbConnectActivity.java    | 13 +++++++++++++
 codec2talkie/src/main/res/xml/device_filter.xml     |  6 ++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/codec2talkie/build.gradle b/codec2talkie/build.gradle
index a0f1906..5515542 100644
--- a/codec2talkie/build.gradle
+++ b/codec2talkie/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.radio.codec2talkie"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 151
-        versionName "1.51"
+        versionCode 152
+        versionName "1.52"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/connect/UsbConnectActivity.java b/codec2talkie/src/main/java/com/radio/codec2talkie/connect/UsbConnectActivity.java
index f7bedf2..f4d797a 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/connect/UsbConnectActivity.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/connect/UsbConnectActivity.java
@@ -22,7 +22,9 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 
 import com.hoho.android.usbserial.driver.CdcAcmSerialDriver;
+import com.hoho.android.usbserial.driver.Ch34xSerialDriver;
 import com.hoho.android.usbserial.driver.Cp21xxSerialDriver;
+import com.hoho.android.usbserial.driver.FtdiSerialDriver;
 import com.hoho.android.usbserial.driver.ProbeTable;
 import com.hoho.android.usbserial.driver.UsbSerialDriver;
 import com.hoho.android.usbserial.driver.UsbSerialPort;
@@ -96,10 +98,21 @@ public class UsbConnectActivity extends AppCompatActivity {
         customTable.addProduct(0x1b4f, 0x9204, CdcAcmSerialDriver.class);
         // Arduino Due
         customTable.addProduct(0x2341, 0x003d, CdcAcmSerialDriver.class);
+        // Arduino Uno/Nano (CH34x)
+        customTable.addProduct(0x1a86, 0x5523, Ch34xSerialDriver.class);
+        customTable.addProduct(0x1a86, 0x7523, Ch34xSerialDriver.class);
         // STM, MCHF
         customTable.addProduct(0x0483, 0x5732, CdcAcmSerialDriver.class);
         // CP2102/2109, iCom
         customTable.addProduct(0x10c4, 0xea60, Cp21xxSerialDriver.class);
+        customTable.addProduct(0x10c4, 0xea70, Cp21xxSerialDriver.class);
+        customTable.addProduct(0x10c4, 0xea71, Cp21xxSerialDriver.class);
+        // FTDI
+        customTable.addProduct(0x0403, 0x6001, FtdiSerialDriver.class);
+        customTable.addProduct(0x0403, 0x6010, FtdiSerialDriver.class);
+        customTable.addProduct(0x0403, 0x6011, FtdiSerialDriver.class);
+        customTable.addProduct(0x0403, 0x6014, FtdiSerialDriver.class);
+        customTable.addProduct(0x0403, 0x6015, FtdiSerialDriver.class);
         return new UsbSerialProber(customTable);
     }
 
diff --git a/codec2talkie/src/main/res/xml/device_filter.xml b/codec2talkie/src/main/res/xml/device_filter.xml
index ed05129..95a1ac9 100644
--- a/codec2talkie/src/main/res/xml/device_filter.xml
+++ b/codec2talkie/src/main/res/xml/device_filter.xml
@@ -15,12 +15,11 @@
     <!-- 0x067B / 0x2303: Prolific PL2303 -->
     <usb-device vendor-id="1659" product-id="8963" />
 
-    <!-- 0x1a86 / 0x?523: Qinheng CH34x -->
+    <!-- 0x1a86 / 0x?523: Qinheng CH34x (Arduino) -->
     <usb-device vendor-id="6790" product-id="21795" /> <!-- 0x5523: CH341A -->
     <usb-device vendor-id="6790" product-id="29987" /> <!-- 0x7523: CH340 -->
 
     <!-- CDC driver -->
-    <usb-device vendor-id="9025" />                   <!-- 0x2341 / ......: Arduino -->
     <usb-device vendor-id="5824" product-id="1155" /> <!-- 0x16C0 / 0x0483: Teensyduino  -->
     <usb-device vendor-id="1003" product-id="8260" /> <!-- 0x03EB / 0x2044: Atmel Lufa -->
     <usb-device vendor-id="7855" product-id="4"    /> <!-- 0x1eaf / 0x0004: Leaflabs Maple -->
@@ -29,6 +28,9 @@
     <!-- spark fun -->
     <usb-device vendor-id="6991" />                   <!-- 0x1b4f / ......: Spark Fun -->
 
+    <!-- arduino -->
+    <usb-device vendor-id="9025" />                   <!-- 0x2341 / ......: Arduino -->
+
     <!-- RIG CAT control -->
     <usb-device vendor-id="1155" product-id="22322" /> <!-- 0x0483 / 0x5732: STM, MCHF -->
     <usb-device vendor-id="4292" product-id="60000" /> <!-- 0x10c4 / 0xea60: CP2102/2109, iCom -->