From 17c3d406051006177bd37b65742a1b8d134073c1 Mon Sep 17 00:00:00 2001
From: kai-morich <mail@kai-morich.de>
Date: Sat, 29 Feb 2020 19:13:05 +0100
Subject: [PATCH] align device_filter.xml with devices recognized by
 DefaultProber

---
 .gitignore                                    |  1 +
 .idea/modules.xml                             |  6 ++--
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +--
 .../src/main/res/xml/device_filter.xml        | 33 +++++++++++--------
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f73cec..0289705 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ build/
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/dictionaries
+.idea/markdown-navigator*.xml
 
 # Sensitive or high-churn files:
 .idea/dataSources.ids
diff --git a/.idea/modules.xml b/.idea/modules.xml
index b3a50a0..4e14cdc 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/usb-serial-for-android.iml" filepath="$PROJECT_DIR$/usb-serial-for-android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/usbSerialExamples/usbSerialExamples.iml" filepath="$PROJECT_DIR$/usbSerialExamples/usbSerialExamples.iml" />
-      <module fileurl="file://$PROJECT_DIR$/usbSerialForAndroid/usbSerialForAndroid.iml" filepath="$PROJECT_DIR$/usbSerialForAndroid/usbSerialForAndroid.iml" />
+      <module fileurl="file://$PROJECT_DIR$/usb-serial-for-android.iml" filepath="$PROJECT_DIR$/usb-serial-for-android.iml" group="usb-serial-for-android" />
+      <module fileurl="file://$PROJECT_DIR$/usbSerialExamples/usbSerialExamples.iml" filepath="$PROJECT_DIR$/usbSerialExamples/usbSerialExamples.iml" group="usb-serial-for-android/usbSerialExamples" />
+      <module fileurl="file://$PROJECT_DIR$/usbSerialForAndroid/usbSerialForAndroid.iml" filepath="$PROJECT_DIR$/usbSerialForAndroid/usbSerialForAndroid.iml" group="usb-serial-for-android/usbSerialForAndroid" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index bcbb0ed..efcf47f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 14dc15c..cd6c462 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Oct 06 09:46:24 CEST 2019
+#Sat Feb 29 19:14:16 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/usbSerialExamples/src/main/res/xml/device_filter.xml b/usbSerialExamples/src/main/res/xml/device_filter.xml
index cd9f4af..18fadc6 100644
--- a/usbSerialExamples/src/main/res/xml/device_filter.xml
+++ b/usbSerialExamples/src/main/res/xml/device_filter.xml
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- 0x0403 / 0x6001: FTDI FT232R UART -->
-    <usb-device vendor-id="1027" product-id="24577" />
-    
-    <!-- 0x0403 / 0x6015: FTDI FT231X -->
-    <usb-device vendor-id="1027" product-id="24597" />
+    <!-- 0x0403 FTDI -->
+    <usb-device vendor-id="1027" product-id="24577" /> <!-- 0x6001: FT232R -->
+    <usb-device vendor-id="1027" product-id="24592" /> <!-- 0x6010: FT2232H -->
+    <usb-device vendor-id="1027" product-id="24593" /> <!-- 0x6011: FT4232H -->
+    <usb-device vendor-id="1027" product-id="24596" /> <!-- 0x6014: FT232H -->
+    <usb-device vendor-id="1027" product-id="24597" /> <!-- 0x6015: FT231X -->
 
-    <!-- 0x2341 / Arduino -->
-    <usb-device vendor-id="9025" />
+    <!-- 0x10C4 / 0xEAxx: Silabs CP210x -->
+    <usb-device vendor-id="4292" product-id="60000" /> <!-- 0xea60: CP2102 -->
+    <usb-device vendor-id="4292" product-id="60016" /> <!-- 0xea70: CP2105 -->
+    <usb-device vendor-id="4292" product-id="60017" /> <!-- 0xea71: CP2108 -->
+    <usb-device vendor-id="4292" product-id="60032" /> <!-- 0xea80: CP2110 -->
 
-    <!-- 0x16C0 / 0x0483: Teensyduino  -->
-    <usb-device vendor-id="5824" product-id="1155" />
-
-    <!-- 0x10C4 / 0xEA60: CP210x UART Bridge -->
-    <usb-device vendor-id="4292" product-id="60000" />
-    
     <!-- 0x067B / 0x2303: Prolific PL2303 -->
     <usb-device vendor-id="1659" product-id="8963" />
-    
+
     <!-- 0x1a86 / 0x7523: Qinheng CH340 -->
     <usb-device vendor-id="6790" product-id="29987" />
+
+    <!-- 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 -->
+    <usb-device vendor-id="3368" product-id="516"  /> <!-- 0x0d28 / 0x0204: ARM mbed -->
 </resources>