mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: remove USB devices we don't support

Browse source 
The HID devices and the Atomics Aquatics Cobalt cannot work on Android
right now. We should claim to support them.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-03-08 20:29:53 -07:00
parent 0212b1b9f7
commit f4589583ef
2 changed files with 4 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
android-mobile/res/xml/device_filter.xml
View file

@ -20,20 +20,6 @@
<!-- Mares Icon HD Custom PID --> <!-- Mares Icon HD Custom PID -->
<usb-device vendor-id="0xFFFF" product-id="0x0005"/> <usb-device vendor-id="0xFFFF" product-id="0x0005"/>
<!-- USB devices -->
<!-- EON Steel -->
<usb-device vendor-id="0x1493" product-id="0x30"/>
<!-- EON Steel core -->
<usb-device vendor-id="0x1493" product-id="0x33"/>
<!-- Scubapro G2 (wrist/console/hud) -->
<usb-device vendor-id="0x2e6c" product-id="0x3201"/>
<usb-device vendor-id="0x2e6c" product-id="0x3211"/>
<usb-device vendor-id="0x2e6c" product-id="0x4201"/>
<!-- Scubapro Aladin Square -->
<usb-device vendor-id="0xc251" product-id="0x2006"/>
<!-- Atomics Aquatics Cobalt -->
<usb-device vendor-id="0x0471" product-id="0x0888"/>
<!-- devices supported by usb-serial-for-android which aren't included in FTDI chips --> <!-- devices supported by usb-serial-for-android which aren't included in FTDI chips -->
<!-- Don't support Arduino / Teensyduino / Leaflabs Maple --> <!-- Don't support Arduino / Teensyduino / Leaflabs Maple -->
<!-- SiLabs CP2102 --> <!-- SiLabs CP2102 -->
@ -54,7 +40,4 @@
<usb-device vendor-id="0x1a86" product-id="0x7523"/> <usb-device vendor-id="0x1a86" product-id="0x7523"/>
<!-- ARM mBed (possibly not used) --> <!-- ARM mBed (possibly not used) -->
<usb-device vendor-id="0x0d28" product-id="0x0204"/> <usb-device vendor-id="0x0d28" product-id="0x0204"/>
</resources>
</resources>

45
mobile-widgets/qmlmanager.cpp
View file

@ -2056,49 +2056,10 @@ void QMLManager::showDownloadPage(QString deviceString)
.arg(productList["Heinrichs Weikamp"].indexOf("OSTC 3")) .arg(productList["Heinrichs Weikamp"].indexOf("OSTC 3"))
.arg(connectionListModel.indexOf("usb-serial")); .arg(connectionListModel.indexOf("usb-serial"));
} else if (deviceString.contains("HeinrichsWeikamp OSTC 2N")) { } else if (deviceString.contains("HeinrichsWeikamp OSTC 2N")) {
name = QString("%1;%2;%3")
.arg(vendorList.indexOf("Heinrichs Weikamp"))
.arg(productList["Heinrichs Weikamp"].indexOf("OSTC 2N"))
.arg(connectionListModel.indexOf("usb-serial"));
} else if (deviceString.contains("mManufacturerName=ATOMIC AQUATICS") &&
deviceString.contains("mProductName=COBALT")) {
if (deviceString.contains("mVersion=2")) {
name = QString("%1;%2;%3")
.arg(vendorList.indexOf("Atomic Aquatics"))
.arg(productList["Atomic Aquatics"].indexOf("Cobalt 2"))
.arg(connectionListModel.indexOf("USB device"));
} else {
name = QString("%1;%2;%3")
.arg(vendorList.indexOf("Atomic Aquatics"))
.arg(productList["Atomic Aquatics"].indexOf("Cobalt"))
.arg(connectionListModel.indexOf("USB device"));
}
} else if (deviceString.contains("mVendorId=5267") && // 0x1493 / 0x0030
deviceString.contains("mProductId=48")) {
name = QString("%1;%2;%3") name = QString("%1;%2;%3")
.arg(connectionListModel.indexOf("Suunto")) .arg(vendorList.indexOf("Heinrichs Weikamp"))
.arg(productList["Suunto"].indexOf("EON Steel")) .arg(productList["Heinrichs Weikamp"].indexOf("OSTC 2N"))
.arg(connectionListModel.indexOf("USB device")); .arg(connectionListModel.indexOf("usb-serial"));
} else if (deviceString.contains("mVendorId=5267") && // 0x1493 / 0x0033
deviceString.contains("mProductId=51")) {
name = QString("%1;%2;%3")
.arg(connectionListModel.indexOf("Suunto"))
.arg(productList["Suunto"].indexOf("EON Core"))
.arg(connectionListModel.indexOf("USB device"));
} else if (deviceString.contains("mVendorId=11884") && // 0x2e6c / 0x3201,0x3211,0x4201
(deviceString.contains("mProductId=12801") ||
deviceString.contains("mProductId=12817") ||
deviceString.contains("mProductId=16897"))) {
name = QString("%1;%2;%3")
.arg(connectionListModel.indexOf("Scubapro"))
.arg(productList["Scubapro"].indexOf("G2"))
.arg(connectionListModel.indexOf("USB device"));
} else if (deviceString.contains("mVendorId=49745") && // 0xc251 / 0x2006
deviceString.contains("mProductId=8198")) {
name = QString("%1;%2;%3")
.arg(connectionListModel.indexOf("Scubapro"))
.arg(productList["Scubapro"].indexOf("Aladin Square"))
.arg(connectionListModel.indexOf("USB device"));
} else if (deviceString.contains("mVendorId=1027") && // FTDI: 0x0403 / 0x6001,0x6010,0x6011,0x6014,0x6015 } else if (deviceString.contains("mVendorId=1027") && // FTDI: 0x0403 / 0x6001,0x6010,0x6011,0x6014,0x6015
(deviceString.contains("mProductId=24577") || (deviceString.contains("mProductId=24577") ||
deviceString.contains("mProductId=24592") || deviceString.contains("mProductId=24592") ||