aboutsummaryrefslogtreecommitdiffstats
path: root/mobile-widgets
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2019-04-24 09:15:41 -0700
committerGravatar bstoeger <32835590+bstoeger@users.noreply.github.com>2019-04-25 13:22:21 +0200
commit263c87b1cc55e264e8c8ba5d2e976e2c78e16a2b (patch)
treef715bc075181d2ba05d33dc93b4120e943b2c77d /mobile-widgets
parent50da417709f8e1f6546898071ddfa2fabdf356eb (diff)
downloadsubsurface-263c87b1cc55e264e8c8ba5d2e976e2c78e16a2b.tar.gz
Update (and fix) device mobile ID's for Scubapro dive computers
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>
Diffstat (limited to 'mobile-widgets')
-rw-r--r--mobile-widgets/qmlmanager.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp
index 9b52ee211..4616ad04f 100644
--- a/mobile-widgets/qmlmanager.cpp
+++ b/mobile-widgets/qmlmanager.cpp
@@ -1938,17 +1938,19 @@ void QMLManager::showDownloadPage(QString deviceString)
.arg(connectionListModel.indexOf("Suunto"))
.arg(productList["Suunto"].indexOf("EON Core"))
.arg(connectionListModel.indexOf("USB device"));
- } else if (deviceString.contains("mVendorId=11884") && // 0x2e6c / 0x3201
- deviceString.contains("mProductId=12801")) {
+ } 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["Suunto"].indexOf("G2"))
+ .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["Suunto"].indexOf("Aladin Square"))
+ .arg(productList["Scubapro"].indexOf("Aladin Square"))
.arg(connectionListModel.indexOf("USB device"));
} else if (deviceString.contains("mVendorId=1027") && // 0x0403 / 0x6001,0x6010,0x6011,0x6015
(deviceString.contains("mProductId=24577") ||