mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-17 20:16:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: don't assume that non-BT means FTDI on Android

Browse source 
We do support download from USB devices like the Atomic Aquatics Cobalt.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-08-08 19:45:40 -07:00
parent 23bde692fa
commit ae6756e7f1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/downloadfromdcthread.cpp
View file

@ -4,6 +4,9 @@
#include "core/subsurface-qt/SettingsObjectWrapper.h"
#include <QDebug>
#include <QRegularExpression>
#if defined(Q_OS_ANDROID)
#include "core/subsurface-string.h"
#endif
QStringList vendorList;
QHash<QString, QStringList> productList;
@ -32,8 +35,8 @@ void DownloadThread::run()
internalData->descriptor = descriptorLookup[m_data->vendor() + m_data->product()];
internalData->download_table = &downloadTable;
#if defined(Q_OS_ANDROID)
// on Android we either use BT or we download via FTDI cable
if (!internalData->bluetooth_mode)
// on Android we either use BT, a USB device, or we download via FTDI cable
if (!internalData->bluetooth_mode && (same_string(internalData->devname, "FTDI") || same_string(internalData->devname, "")))
internalData->devname = "ftdi";
#endif
qDebug() << "Starting download from " << (internalData->bluetooth_mode ? "BT" : internalData->devname);