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

Update (and fix) device mobile ID's for Scubapro dive computers

Browse source 
I'm not sure this is actually relevant for anything any more, but this
adds the USB device ID's for the Scubapro G2 Console and HUD versions.
It also fixes things to use the proper vendor name (a bit too much
cut-and-paste, where the code said "Suunto" instead of "Scubapro").

The real device ID changes are in libdivecomputer, this is just the
Android xml list for recognized USB devices that likely nobody really
uses.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2019-04-24 09:15:41 -07:00 committed by bstoeger
parent 50da417709
commit 263c87b1cc
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,8 +19,10 @@
<usb-device vendor-id="0x1493" product-id="0x30"/> <usb-device vendor-id="0x1493" product-id="0x30"/>
<!-- EON Steel core --> <!-- EON Steel core -->
<usb-device vendor-id="0x1493" product-id="0x33"/> <usb-device vendor-id="0x1493" product-id="0x33"/>
<!-- Scubapro G2 --> <!-- Scubapro G2 (wrist/console/hud) -->
<usb-device vendor-id="0x2e6c" product-id="0x3201"/> <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 --> <!-- Scubapro Aladin Square -->
<usb-device vendor-id="0xc251" product-id="0x2006"/> <usb-device vendor-id="0xc251" product-id="0x2006"/>
<!-- Atomics Aquatics Cobalt --> <!-- Atomics Aquatics Cobalt -->

4
android/res/xml/device_filter.xml
View file

@ -19,8 +19,10 @@
<usb-device vendor-id="0x1493" product-id="0x30"/> <usb-device vendor-id="0x1493" product-id="0x30"/>
<!-- EON Steel core --> <!-- EON Steel core -->
<usb-device vendor-id="0x1493" product-id="0x33"/> <usb-device vendor-id="0x1493" product-id="0x33"/>
<!-- Scubapro G2 --> <!-- Scubapro G2 (wrist/console/hud) -->
<usb-device vendor-id="0x2e6c" product-id="0x3201"/> <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 --> <!-- Scubapro Aladin Square -->
<usb-device vendor-id="0xc251" product-id="0x2006"/> <usb-device vendor-id="0xc251" product-id="0x2006"/>
<!-- Atomics Aquatics Cobalt --> <!-- Atomics Aquatics Cobalt -->

10
mobile-widgets/qmlmanager.cpp
View file

@ -1938,17 +1938,19 @@ void QMLManager::showDownloadPage(QString deviceString)
.arg(connectionListModel.indexOf("Suunto")) .arg(connectionListModel.indexOf("Suunto"))
.arg(productList["Suunto"].indexOf("EON Core")) .arg(productList["Suunto"].indexOf("EON Core"))
.arg(connectionListModel.indexOf("USB device")); .arg(connectionListModel.indexOf("USB device"));
} else if (deviceString.contains("mVendorId=11884") && // 0x2e6c / 0x3201 } else if (deviceString.contains("mVendorId=11884") && // 0x2e6c / 0x3201,0x3211,0x4201
deviceString.contains("mProductId=12801")) { (deviceString.contains("mProductId=12801") ||
deviceString.contains("mProductId=12817") ||
deviceString.contains("mProductId=16897"))) {
name = QString("%1;%2;%3") name = QString("%1;%2;%3")
.arg(connectionListModel.indexOf("Scubapro")) .arg(connectionListModel.indexOf("Scubapro"))
.arg(productList["Suunto"].indexOf("G2")) .arg(productList["Scubapro"].indexOf("G2"))
.arg(connectionListModel.indexOf("USB device")); .arg(connectionListModel.indexOf("USB device"));
} else if (deviceString.contains("mVendorId=49745") && // 0xc251 / 0x2006 } else if (deviceString.contains("mVendorId=49745") && // 0xc251 / 0x2006
deviceString.contains("mProductId=8198")) { deviceString.contains("mProductId=8198")) {
name = QString("%1;%2;%3") name = QString("%1;%2;%3")
.arg(connectionListModel.indexOf("Scubapro")) .arg(connectionListModel.indexOf("Scubapro"))
.arg(productList["Suunto"].indexOf("Aladin Square")) .arg(productList["Scubapro"].indexOf("Aladin Square"))
.arg(connectionListModel.indexOf("USB device")); .arg(connectionListModel.indexOf("USB device"));
} else if (deviceString.contains("mVendorId=1027") && // 0x0403 / 0x6001,0x6010,0x6011,0x6015 } else if (deviceString.contains("mVendorId=1027") && // 0x0403 / 0x6001,0x6010,0x6011,0x6015
(deviceString.contains("mProductId=24577") || (deviceString.contains("mProductId=24577") ||