diff options
-rw-r--r-- | android-mobile/res/xml/device_filter.xml | 19 | ||||
-rw-r--r-- | mobile-widgets/qmlmanager.cpp | 45 |
2 files changed, 4 insertions, 60 deletions
diff --git a/android-mobile/res/xml/device_filter.xml b/android-mobile/res/xml/device_filter.xml index 54445c997..cace30025 100644 --- a/android-mobile/res/xml/device_filter.xml +++ b/android-mobile/res/xml/device_filter.xml @@ -20,20 +20,6 @@ <!-- Mares Icon HD Custom PID --> <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 --> <!-- Don't support Arduino / Teensyduino / Leaflabs Maple --> <!-- SiLabs CP2102 --> @@ -54,7 +40,4 @@ <usb-device vendor-id="0x1a86" product-id="0x7523"/> <!-- ARM mBed (possibly not used) --> <usb-device vendor-id="0x0d28" product-id="0x0204"/> - - - -</resources>
\ No newline at end of file +</resources> diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 1e0717adb..4dd8de98c 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -2056,49 +2056,10 @@ void QMLManager::showDownloadPage(QString deviceString) .arg(productList["Heinrichs Weikamp"].indexOf("OSTC 3")) .arg(connectionListModel.indexOf("usb-serial")); } 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") - .arg(connectionListModel.indexOf("Suunto")) - .arg(productList["Suunto"].indexOf("EON Steel")) - .arg(connectionListModel.indexOf("USB device")); - } 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")); + .arg(vendorList.indexOf("Heinrichs Weikamp")) + .arg(productList["Heinrichs Weikamp"].indexOf("OSTC 2N")) + .arg(connectionListModel.indexOf("usb-serial")); } else if (deviceString.contains("mVendorId=1027") && // FTDI: 0x0403 / 0x6001,0x6010,0x6011,0x6014,0x6015 (deviceString.contains("mProductId=24577") || deviceString.contains("mProductId=24592") || |