Skip to content

Commit

Permalink
Android: Update Serial Drivers
Browse files Browse the repository at this point in the history
  • Loading branch information
@HTRamsey
HTRamsey committed Jul 4, 2024
1 parent 92144e4 commit c970caa
Show file tree
Hide file tree
Showing 23 changed files with 1,324 additions and 3,099 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ ui_*

# android
android/local.properties
*.class

# doxygen
src/html/
Expand Down
2 changes: 2 additions & 0 deletions android/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
<action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
Expand Down
8 changes: 7 additions & 1 deletion android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.3.2'
classpath 'com.android.tools.build:gradle:8.4.1'
}
}

repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}

apply plugin: 'com.android.application'

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
implementation 'androidx.core:core:1.12.0'
implementation 'com.github.mik3y:usb-serial-for-android:3.7.3'
}

android {
Expand Down Expand Up @@ -59,6 +61,10 @@ android {
options.incremental = true
}

buildFeatures {
buildConfig = true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
Expand Down
Binary file removed android/libs/d2xx.jar
View file
Binary file not shown.
88 changes: 88 additions & 0 deletions android/res/values/arrays.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="baud_rate">
<item>300</item>
<item>600</item>
<item>1200</item>
<item>4800</item>
<item>9600</item>
<item>19200</item>
<item>38400</item>
<item>57600</item>
<item>115200</item>
<item>230400</item>
<item>460800</item>
<item>921600</item>
<item>1000000</item>
<item>1500000</item>
<item>2000000</item>
<item>3000000</item>
<item>4000000</item>
<item>5000000</item>
<item>6000000</item>
<item>7000000</item>
<item>8000000</item>
<item>9000000</item>
<item>10000000</item>
<item>11000000</item>
<item>12000000</item>
</string-array>

<string-array name="stop_bits">
<item>1</item>
<item>2</item>
</string-array>

<string-array name="data_bits">
<item>7</item>
<item>8</item>
</string-array>

<string-array name="parity">
<item>none</item>
<item>odd</item>
<item>even</item>
<item>mark</item>
<item>space</item>
</string-array>

<string-array name="flow_control">
<item>none</item>
<item>CTS/RTS</item>
<item>DTR/DSR</item>
<item>XOFF/XON</item>
</string-array>

<string-array name="buffer_size">
<item>32768</item>
<item>1M</item>
<item>2M</item>
<item>3M</item>
<item>4M</item>
<item>5M</item>
<item>6M</item>
<item>7M</item>
<item>8M</item>
<item>9M</item>
<item>10M</item>
</string-array>

<string-array name="max_transfer_size">
<item>32768</item>
<item>16384</item>
<item>8192</item>
<item>4096</item>
<item>2048</item>
<item>1024</item>
<item>512</item>
<item>256</item>
<item>128</item>
<item>64</item>
</string-array>

<string-array name="read_modes">
<item>event: SerialInputOutputManager.onNewData()</item>
<item>direct: UsbSerialPort.read()</item>
</string-array>

</resources>
88 changes: 8 additions & 80 deletions android/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,83 +1,11 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string-array name="baud_rate">
<item>300</item>
<item>600</item>
<item>1200</item>
<item>4800</item>
<item>9600</item>
<item>19200</item>
<item>38400</item>
<item>57600</item>
<item>115200</item>
<item>230400</item>
<item>460800</item>
<item>921600</item>
<item>1000000</item>
<item>1500000</item>
<item>2000000</item>
<item>3000000</item>
<item>4000000</item>
<item>5000000</item>
<item>6000000</item>
<item>7000000</item>
<item>8000000</item>
<item>9000000</item>
<item>10000000</item>
<item>11000000</item>
<item>12000000</item>
</string-array>

<string-array name="stop_bits">
<item>1</item>
<item>2</item>
</string-array>

<string-array name="data_bits">
<item>7</item>
<item>8</item>
</string-array>

<string-array name="parity">
<item>none</item>
<item>odd</item>
<item>even</item>
<item>mark</item>
<item>space</item>
</string-array>

<string-array name="flow_control">
<item>none</item>
<item>CTS/RTS</item>
<item>DTR/DSR</item>
<item>XOFF/XON</item>
</string-array>

<string-array name="buffer_size">
<item>32768</item>
<item>1M</item>
<item>2M</item>
<item>3M</item>
<item>4M</item>
<item>5M</item>
<item>6M</item>
<item>7M</item>
<item>8M</item>
<item>9M</item>
<item>10M</item>
</string-array>

<string-array name="max_transfer_size">
<item>32768</item>
<item>16384</item>
<item>8192</item>
<item>4096</item>
<item>2048</item>
<item>1024</item>
<item>512</item>
<item>256</item>
<item>128</item>
<item>64</item>
</string-array>

<string name="devices">USB Devices</string>
<string name="CdcAcm">CDC ACM USB Device</string>
<string name="ChromeCcd">Chrome CCD USB Device</string>
<string name="Cp21xx">CP21XX USB Device</string>
<string name="FTDI">FTDI USB Device</string>
<string name="GsmModem">GSM Modem USB Device</string>
<string name="Prolific">Prolific USB Device</string>
<string name="Unknown">Unknown USB Device</string>
</resources>
50 changes: 36 additions & 14 deletions android/res/xml/device_filter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,40 @@
<resources>
<!-- Allow anything connected -->
<usb-device />
<!-- <usb-device vendor-id="1118" product-id="688"></usb-device> -->
<!-- <usb-device vendor-id="1027" product-id="24577" /> --> <!-- FT232RL -->
<!-- <usb-device vendor-id="1027" product-id="24596" /> --> <!-- FT232H -->
<!-- <usb-device vendor-id="1027" product-id="24592" /> --> <!-- FT2232C/D/HL -->
<!-- <usb-device vendor-id="1027" product-id="24593" /> --> <!-- FT4232HL -->
<!-- <usb-device vendor-id="1027" product-id="24597" /> --> <!-- FT230X -->
<!-- <usb-device vendor-id="1027" product-id="24604" /> --> <!-- FT4222 -->
<!-- <usb-device vendor-id="1412" product-id="45088" /> --> <!-- REX-USB60F -->
<!-- <usb-device vendor-id="1027" product-id="24641" /> --> <!-- FT4233HPQ -->
<!-- <usb-device vendor-id="1027" product-id="24643" /> --> <!-- FT4232HPQ -->
<!-- <usb-device vendor-id="1027" product-id="24640" /> --> <!-- FT2233HPQ-->
<!-- <usb-device vendor-id="1027" product-id="24642" /> --> <!-- FT4232HPQ -->
<!-- <usb-device vendor-id="1027" product-id="24645" /> --> <!-- FT232HPQ -->
<!-- <usb-device vendor-id="1027" product-id="24644" /> --> <!-- FT233HPQ -->

<!-- 0x0403 / 0x60??: 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: FT230X, FT231X, FT234XD -->

<!-- 0x10C4 / 0xEA??: Silabs CP210x -->
<!-- <usb-device vendor-id="4292" product-id="60000" /> --> <!-- 0xea60: CP2102 and other CP210x single port devices -->
<!-- <usb-device vendor-id="4292" product-id="60016" /> --> <!-- 0xea70: CP2105 -->
<!-- <usb-device vendor-id="4292" product-id="60017" /> --> <!-- 0xea71: CP2108 -->

<!-- 0x067B / 0x23?3: Prolific PL2303x -->
<!-- <usb-device vendor-id="1659" product-id="8963" /> --> <!-- 0x2303: PL2303HX, HXD, TA, ... -->
<!-- <usb-device vendor-id="1659" product-id="9123" /> --> <!-- 0x23a3: PL2303GC -->
<!-- <usb-device vendor-id="1659" product-id="9139" /> --> <!-- 0x23b3: PL2303GB -->
<!-- <usb-device vendor-id="1659" product-id="9155" /> --> <!-- 0x23c3: PL2303GT -->
<!-- <usb-device vendor-id="1659" product-id="9171" /> --> <!-- 0x23d3: PL2303GL -->
<!-- <usb-device vendor-id="1659" product-id="9187" /> --> <!-- 0x23e3: PL2303GE -->
<!-- <usb-device vendor-id="1659" product-id="9203" /> --> <!-- 0x23f3: PL2303GS -->

<!-- 0x1a86 / 0x?523: Qinheng CH34x -->
<!-- <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 -->
<!-- <usb-device vendor-id="3368" product-id="516" /> --> <!-- 0x0d28 / 0x0204: ARM mbed -->
<!-- <usb-device vendor-id="1155" product-id="22336" /> --> <!-- 0x0483 / 0x5740: ST CDC -->
<!-- <usb-device vendor-id="11914" product-id="5" /> --> <!-- 0x2E8A / 0x0005: Raspberry Pi Pico Micropython -->
<!-- <usb-device vendor-id="11914" product-id="10" /> --> <!-- 0x2E8A / 0x000A: Raspberry Pi Pico SDK -->
<!-- <usb-device vendor-id="6790" product-id="21972" /> --> <!-- 0x1A86 / 0x55D4: Qinheng CH9102F -->
</resources>
Loading

0 comments on commit c970caa

Please sign in to comment.