From ae6756e7f152ffe284d904261eccf0e9a9f63196 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 8 Aug 2018 19:45:40 -0700 Subject: Android: don't assume that non-BT means FTDI on Android We do support download from USB devices like the Atomic Aquatics Cobalt. Signed-off-by: Dirk Hohndel --- core/downloadfromdcthread.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/downloadfromdcthread.cpp b/core/downloadfromdcthread.cpp index 822f55241..a05dffb8d 100644 --- a/core/downloadfromdcthread.cpp +++ b/core/downloadfromdcthread.cpp @@ -4,6 +4,9 @@ #include "core/subsurface-qt/SettingsObjectWrapper.h" #include #include +#if defined(Q_OS_ANDROID) +#include "core/subsurface-string.h" +#endif QStringList vendorList; QHash 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); -- cgit v1.2.3-70-g09d2