2017-04-18 17:14:03 +00:00
|
|
|
#include "downloadfromdcthread.h"
|
|
|
|
#include "core/libdivecomputer.h"
|
2018-02-28 22:37:09 +00:00
|
|
|
#include "core/qthelper.h"
|
2018-08-15 09:54:37 +00:00
|
|
|
#include "core/settings/qPrefDiveComputer.h"
|
2019-07-15 21:44:39 +00:00
|
|
|
#include "core/divelist.h"
|
2017-05-26 12:07:02 +00:00
|
|
|
#include <QDebug>
|
2018-08-09 02:45:40 +00:00
|
|
|
#if defined(Q_OS_ANDROID)
|
|
|
|
#include "core/subsurface-string.h"
|
|
|
|
#endif
|
2017-04-18 17:14:03 +00:00
|
|
|
|
2017-04-27 18:24:14 +00:00
|
|
|
QStringList vendorList;
|
|
|
|
QHash<QString, QStringList> productList;
|
2018-07-26 01:43:55 +00:00
|
|
|
static QHash<QString, QStringList> mobileProductList; // BT, BLE or FTDI supported DCs for mobile
|
2017-04-27 18:24:14 +00:00
|
|
|
QMap<QString, dc_descriptor_t *> descriptorLookup;
|
2017-07-17 04:49:11 +00:00
|
|
|
ConnectionListModel connectionListModel;
|
2017-04-27 18:24:14 +00:00
|
|
|
|
2017-04-18 17:14:03 +00:00
|
|
|
static QString str_error(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
va_start(args, fmt);
|
2020-10-26 14:24:18 +00:00
|
|
|
const QString str = QString().vasprintf(fmt, args);
|
2017-04-18 17:14:03 +00:00
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2018-09-21 22:41:28 +00:00
|
|
|
static void updateRememberedDCs()
|
|
|
|
{
|
2018-10-02 17:54:54 +00:00
|
|
|
QString current = qPrefDiveComputer::vendor() + " - " + qPrefDiveComputer::product() + " - " + qPrefDiveComputer::device();
|
2018-09-21 22:41:28 +00:00
|
|
|
QStringList dcs = {
|
2018-10-02 17:54:54 +00:00
|
|
|
qPrefDiveComputer::vendor1() + " - " + qPrefDiveComputer::product1() + " - " + qPrefDiveComputer::device1(),
|
|
|
|
qPrefDiveComputer::vendor2() + " - " + qPrefDiveComputer::product2() + " - " + qPrefDiveComputer::device2(),
|
|
|
|
qPrefDiveComputer::vendor3() + " - " + qPrefDiveComputer::product3() + " - " + qPrefDiveComputer::device3(),
|
|
|
|
qPrefDiveComputer::vendor4() + " - " + qPrefDiveComputer::product4() + " - " + qPrefDiveComputer::device4()
|
2018-09-21 22:41:28 +00:00
|
|
|
};
|
|
|
|
if (dcs.contains(current))
|
|
|
|
// already in the list
|
|
|
|
return;
|
|
|
|
// add the current one as the first remembered one and drop the 4th one
|
|
|
|
// don't get confused by 0-based and 1-based indices!
|
|
|
|
if (dcs[2] != " - ") {
|
|
|
|
qPrefDiveComputer::set_vendor4(qPrefDiveComputer::vendor3());
|
|
|
|
qPrefDiveComputer::set_product4(qPrefDiveComputer::product3());
|
|
|
|
qPrefDiveComputer::set_device4(qPrefDiveComputer::device3());
|
|
|
|
}
|
|
|
|
if (dcs[1] != " - ") {
|
|
|
|
qPrefDiveComputer::set_vendor3(qPrefDiveComputer::vendor2());
|
|
|
|
qPrefDiveComputer::set_product3(qPrefDiveComputer::product2());
|
|
|
|
qPrefDiveComputer::set_device3(qPrefDiveComputer::device2());
|
|
|
|
}
|
|
|
|
if (dcs[0] != " - ") {
|
|
|
|
qPrefDiveComputer::set_vendor2(qPrefDiveComputer::vendor1());
|
|
|
|
qPrefDiveComputer::set_product2(qPrefDiveComputer::product1());
|
|
|
|
qPrefDiveComputer::set_device2(qPrefDiveComputer::device1());
|
|
|
|
}
|
|
|
|
qPrefDiveComputer::set_vendor1(qPrefDiveComputer::vendor());
|
|
|
|
qPrefDiveComputer::set_product1(qPrefDiveComputer::product());
|
|
|
|
qPrefDiveComputer::set_device1(qPrefDiveComputer::device());
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:59:38 +00:00
|
|
|
#define NUMTRANSPORTS 7
|
|
|
|
static QString transportStringTable[NUMTRANSPORTS] = {
|
|
|
|
QStringLiteral("SERIAL"),
|
|
|
|
QStringLiteral("USB"),
|
|
|
|
QStringLiteral("USBHID"),
|
|
|
|
QStringLiteral("IRDA"),
|
|
|
|
QStringLiteral("BT"),
|
|
|
|
QStringLiteral("BLE"),
|
|
|
|
QStringLiteral("USBSTORAGE"),
|
|
|
|
};
|
|
|
|
|
|
|
|
static QString getTransportString(unsigned int transport)
|
|
|
|
{
|
|
|
|
QString ts;
|
|
|
|
for (int i = 0; i < NUMTRANSPORTS; i++) {
|
|
|
|
if (transport & 1 << i)
|
|
|
|
ts += transportStringTable[i] + ", ";
|
|
|
|
}
|
|
|
|
ts.chop(2);
|
|
|
|
return ts;
|
|
|
|
}
|
2018-09-21 22:41:28 +00:00
|
|
|
|
2018-12-10 13:49:32 +00:00
|
|
|
DownloadThread::DownloadThread() : downloadTable({ 0 }),
|
2019-02-28 21:45:17 +00:00
|
|
|
diveSiteTable({ 0 }),
|
2018-12-10 13:49:32 +00:00
|
|
|
m_data(DCDeviceData::instance())
|
2017-04-18 17:14:03 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void DownloadThread::run()
|
|
|
|
{
|
2017-05-26 14:40:50 +00:00
|
|
|
auto internalData = m_data->internalData();
|
2020-05-14 19:15:24 +00:00
|
|
|
internalData->descriptor = descriptorLookup[m_data->vendor().toLower() + m_data->product().toLower()];
|
2018-07-26 01:43:55 +00:00
|
|
|
internalData->download_table = &downloadTable;
|
2019-02-28 21:45:17 +00:00
|
|
|
internalData->sites = &diveSiteTable;
|
2020-10-19 17:19:32 +00:00
|
|
|
internalData->devices = &deviceTable;
|
2018-10-06 18:23:08 +00:00
|
|
|
internalData->btname = strdup(m_data->devBluetoothName().toUtf8());
|
2018-10-10 08:01:02 +00:00
|
|
|
if (!internalData->descriptor) {
|
|
|
|
qDebug() << "No download possible when DC type is unknown";
|
|
|
|
return;
|
|
|
|
}
|
2020-10-03 19:59:38 +00:00
|
|
|
// get the list of transports that this device supports and filter depending on Bluetooth option
|
|
|
|
unsigned int transports = dc_descriptor_get_transports(internalData->descriptor);
|
|
|
|
if (internalData->bluetooth_mode)
|
|
|
|
transports &= (DC_TRANSPORT_BLE | DC_TRANSPORT_BLUETOOTH);
|
|
|
|
else
|
|
|
|
transports &= ~(DC_TRANSPORT_BLE | DC_TRANSPORT_BLUETOOTH);
|
|
|
|
if (transports == DC_TRANSPORT_USBHID)
|
|
|
|
internalData->devname = "";
|
|
|
|
|
|
|
|
qDebug() << "Starting download from " << getTransportString(transports);
|
2019-05-05 23:07:15 +00:00
|
|
|
qDebug() << "downloading" << (internalData->force_download ? "all" : "only new") << "dives";
|
2019-06-04 18:59:08 +00:00
|
|
|
clear_dive_table(&downloadTable);
|
2019-02-28 21:45:17 +00:00
|
|
|
clear_dive_site_table(&diveSiteTable);
|
2020-10-19 17:19:32 +00:00
|
|
|
clear_device_table(&deviceTable);
|
2017-05-26 14:40:50 +00:00
|
|
|
|
2017-05-19 09:23:11 +00:00
|
|
|
Q_ASSERT(internalData->download_table != nullptr);
|
2017-04-18 17:14:03 +00:00
|
|
|
const char *errorText;
|
|
|
|
import_thread_cancelled = false;
|
2017-10-23 22:27:52 +00:00
|
|
|
error.clear();
|
2017-05-19 09:23:11 +00:00
|
|
|
if (!strcmp(internalData->vendor, "Uemis"))
|
|
|
|
errorText = do_uemis_import(internalData);
|
2017-04-18 17:14:03 +00:00
|
|
|
else
|
2017-05-19 09:23:11 +00:00
|
|
|
errorText = do_libdivecomputer_import(internalData);
|
2018-06-21 06:50:11 +00:00
|
|
|
if (errorText) {
|
2017-05-19 09:23:11 +00:00
|
|
|
error = str_error(errorText, internalData->devname, internalData->vendor, internalData->product);
|
2018-06-21 06:50:11 +00:00
|
|
|
qDebug() << "Finishing download thread:" << error;
|
|
|
|
} else {
|
2018-10-04 16:34:30 +00:00
|
|
|
if (!downloadTable.nr)
|
|
|
|
error = tr("No new dives downloaded from dive computer");
|
2018-06-21 06:50:11 +00:00
|
|
|
qDebug() << "Finishing download thread:" << downloadTable.nr << "dives downloaded";
|
|
|
|
}
|
2018-08-15 09:54:37 +00:00
|
|
|
qPrefDiveComputer::set_vendor(internalData->vendor);
|
|
|
|
qPrefDiveComputer::set_product(internalData->product);
|
|
|
|
qPrefDiveComputer::set_device(internalData->devname);
|
|
|
|
qPrefDiveComputer::set_device_name(m_data->devBluetoothName());
|
2018-09-21 22:41:28 +00:00
|
|
|
|
|
|
|
updateRememberedDCs();
|
2017-04-18 17:14:03 +00:00
|
|
|
}
|
2017-04-27 18:24:14 +00:00
|
|
|
|
|
|
|
void fill_computer_list()
|
|
|
|
{
|
|
|
|
dc_iterator_t *iterator = NULL;
|
|
|
|
dc_descriptor_t *descriptor = NULL;
|
|
|
|
|
2018-04-25 22:51:35 +00:00
|
|
|
unsigned int transportMask = get_supported_transports(NULL);
|
2018-04-19 04:19:14 +00:00
|
|
|
|
2017-04-27 18:24:14 +00:00
|
|
|
dc_descriptor_iterator(&iterator);
|
|
|
|
while (dc_iterator_next(iterator, &descriptor) == DC_STATUS_SUCCESS) {
|
2018-04-19 10:15:49 +00:00
|
|
|
// mask out the transports that aren't supported
|
2018-04-25 22:51:35 +00:00
|
|
|
unsigned int transports = dc_descriptor_get_transports(descriptor) & transportMask;
|
2018-04-19 10:15:49 +00:00
|
|
|
if (transports == 0)
|
2018-04-19 04:19:14 +00:00
|
|
|
// none of the transports are available, skip
|
|
|
|
continue;
|
|
|
|
|
2017-04-27 18:24:14 +00:00
|
|
|
const char *vendor = dc_descriptor_get_vendor(descriptor);
|
|
|
|
const char *product = dc_descriptor_get_product(descriptor);
|
|
|
|
if (!vendorList.contains(vendor))
|
|
|
|
vendorList.append(vendor);
|
|
|
|
if (!productList[vendor].contains(product))
|
2018-04-19 10:15:49 +00:00
|
|
|
productList[vendor].append(product);
|
2017-04-27 18:24:14 +00:00
|
|
|
|
2020-05-14 19:15:24 +00:00
|
|
|
descriptorLookup[QString(vendor).toLower() + QString(product).toLower()] = descriptor;
|
2017-04-27 18:24:14 +00:00
|
|
|
}
|
|
|
|
dc_iterator_free(iterator);
|
2019-04-03 18:21:53 +00:00
|
|
|
Q_FOREACH (QString vendor, vendorList) {
|
|
|
|
auto &l = productList[vendor];
|
|
|
|
std::sort(l.begin(), l.end());
|
|
|
|
}
|
2017-04-27 18:24:14 +00:00
|
|
|
|
2017-06-22 09:27:51 +00:00
|
|
|
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
|
|
|
|
/* currently suppress the Uemis Zurich on Q_OS_ANDROID and Q_OS_IOS,
|
|
|
|
* as it is no BT device */
|
|
|
|
|
2017-04-27 18:24:14 +00:00
|
|
|
/* and add the Uemis Zurich which we are handling internally
|
|
|
|
THIS IS A HACK as we magically have a data structure here that
|
|
|
|
happens to match a data structure that is internal to libdivecomputer;
|
|
|
|
this WILL BREAK if libdivecomputer changes the dc_descriptor struct...
|
|
|
|
eventually the UEMIS code needs to move into libdivecomputer, I guess */
|
2017-07-19 13:14:18 +00:00
|
|
|
struct mydescriptor *mydescriptor = (struct mydescriptor *)malloc(sizeof(struct mydescriptor));
|
2017-04-27 18:24:14 +00:00
|
|
|
mydescriptor->vendor = "Uemis";
|
|
|
|
mydescriptor->product = "Zurich";
|
|
|
|
mydescriptor->type = DC_FAMILY_NULL;
|
|
|
|
mydescriptor->model = 0;
|
2018-08-27 17:32:14 +00:00
|
|
|
mydescriptor->transports = DC_TRANSPORT_USBSTORAGE;
|
2017-04-27 18:24:14 +00:00
|
|
|
|
|
|
|
if (!vendorList.contains("Uemis"))
|
|
|
|
vendorList.append("Uemis");
|
|
|
|
|
|
|
|
if (!productList["Uemis"].contains("Zurich"))
|
|
|
|
productList["Uemis"].push_back("Zurich");
|
|
|
|
|
2020-05-14 19:15:24 +00:00
|
|
|
// note: keys in the descriptorLookup are always lowercase
|
|
|
|
descriptorLookup["uemiszurich"] = (dc_descriptor_t *)mydescriptor;
|
2017-06-22 09:27:51 +00:00
|
|
|
#endif
|
2017-04-27 18:24:14 +00:00
|
|
|
|
2019-04-03 18:21:53 +00:00
|
|
|
std::sort(vendorList.begin(), vendorList.end());
|
2017-04-27 18:24:14 +00:00
|
|
|
}
|
2017-05-12 17:18:20 +00:00
|
|
|
|
2018-04-19 13:37:13 +00:00
|
|
|
void show_computer_list()
|
|
|
|
{
|
2018-05-12 18:22:54 +00:00
|
|
|
unsigned int transportMask = get_supported_transports(NULL);
|
2018-04-19 13:37:13 +00:00
|
|
|
qDebug() << "Supported dive computers:";
|
|
|
|
Q_FOREACH (QString vendor, vendorList) {
|
|
|
|
QString msg = vendor + ": ";
|
|
|
|
Q_FOREACH (QString product, productList[vendor]) {
|
2020-05-14 19:15:24 +00:00
|
|
|
dc_descriptor_t *descriptor = descriptorLookup[vendor.toLower() + product.toLower()];
|
2018-05-12 18:22:54 +00:00
|
|
|
unsigned int transport = dc_descriptor_get_transports(descriptor) & transportMask;
|
|
|
|
QString transportString = getTransportString(transport);
|
2018-07-26 01:43:55 +00:00
|
|
|
msg += product + " (" + transportString + "), ";
|
2018-04-19 13:37:13 +00:00
|
|
|
}
|
|
|
|
msg.chop(2);
|
|
|
|
qDebug() << msg;
|
|
|
|
}
|
|
|
|
}
|
2017-06-06 02:41:57 +00:00
|
|
|
|
2018-06-09 14:59:02 +00:00
|
|
|
DCDeviceData::DCDeviceData()
|
2017-05-19 09:23:11 +00:00
|
|
|
{
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
|
|
data.download_table = nullptr;
|
|
|
|
data.diveid = 0;
|
|
|
|
data.deviceid = 0;
|
2018-07-29 00:23:48 +00:00
|
|
|
#if defined(BT_SUPPORT)
|
2018-06-09 14:46:19 +00:00
|
|
|
data.bluetooth_mode = true;
|
2018-07-29 00:23:48 +00:00
|
|
|
#else
|
|
|
|
data.bluetooth_mode = false;
|
|
|
|
#endif
|
2018-06-09 14:46:19 +00:00
|
|
|
data.force_download = false;
|
|
|
|
data.libdc_dump = false;
|
2018-06-27 23:00:31 +00:00
|
|
|
#if defined(SUBSURFACE_MOBILE)
|
|
|
|
data.libdc_log = true;
|
|
|
|
#else
|
2018-06-09 14:46:19 +00:00
|
|
|
data.libdc_log = false;
|
2018-06-27 23:00:31 +00:00
|
|
|
#endif
|
2020-03-15 01:11:46 +00:00
|
|
|
#if defined(Q_OS_ANDROID)
|
|
|
|
data.androidUsbDeviceDescriptor = nullptr;
|
|
|
|
#endif
|
2017-05-19 09:23:11 +00:00
|
|
|
}
|
|
|
|
|
2017-06-06 02:41:57 +00:00
|
|
|
DCDeviceData *DCDeviceData::instance()
|
|
|
|
{
|
2018-12-10 14:21:50 +00:00
|
|
|
static DCDeviceData self;
|
|
|
|
return &self;
|
2017-06-06 02:41:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
QStringList DCDeviceData::getProductListFromVendor(const QString &vendor)
|
|
|
|
{
|
|
|
|
return productList[vendor];
|
|
|
|
}
|
|
|
|
|
2017-07-17 04:49:11 +00:00
|
|
|
int DCDeviceData::getMatchingAddress(const QString &vendor, const QString &product)
|
|
|
|
{
|
2019-03-20 14:31:24 +00:00
|
|
|
Q_UNUSED(vendor)
|
|
|
|
return connectionListModel.indexOf(product);
|
2017-07-17 04:49:11 +00:00
|
|
|
}
|
|
|
|
|
2018-07-26 01:43:55 +00:00
|
|
|
DCDeviceData *DownloadThread::data()
|
2017-05-19 09:23:11 +00:00
|
|
|
{
|
|
|
|
return m_data;
|
|
|
|
}
|
|
|
|
|
2017-05-12 17:18:20 +00:00
|
|
|
QString DCDeviceData::vendor() const
|
|
|
|
{
|
|
|
|
return data.vendor;
|
|
|
|
}
|
|
|
|
|
|
|
|
QString DCDeviceData::product() const
|
|
|
|
{
|
|
|
|
return data.product;
|
|
|
|
}
|
|
|
|
|
|
|
|
QString DCDeviceData::devName() const
|
|
|
|
{
|
|
|
|
return data.devname;
|
|
|
|
}
|
|
|
|
|
2017-11-12 11:33:20 +00:00
|
|
|
QString DCDeviceData::devBluetoothName() const
|
|
|
|
{
|
|
|
|
return m_devBluetoothName;
|
|
|
|
}
|
|
|
|
|
2017-05-12 17:18:20 +00:00
|
|
|
QString DCDeviceData::descriptor() const
|
|
|
|
{
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
|
|
|
bool DCDeviceData::bluetoothMode() const
|
|
|
|
{
|
|
|
|
return data.bluetooth_mode;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool DCDeviceData::forceDownload() const
|
|
|
|
{
|
|
|
|
return data.force_download;
|
|
|
|
}
|
|
|
|
|
|
|
|
int DCDeviceData::deviceId() const
|
|
|
|
{
|
|
|
|
return data.deviceid;
|
|
|
|
}
|
|
|
|
|
|
|
|
int DCDeviceData::diveId() const
|
|
|
|
{
|
|
|
|
return data.diveid;
|
|
|
|
}
|
|
|
|
|
2018-07-26 01:43:55 +00:00
|
|
|
void DCDeviceData::setVendor(const QString &vendor)
|
2017-05-12 17:18:20 +00:00
|
|
|
{
|
2018-02-28 22:37:09 +00:00
|
|
|
data.vendor = copy_qstring(vendor);
|
2017-05-12 17:18:20 +00:00
|
|
|
}
|
|
|
|
|
2018-07-26 01:43:55 +00:00
|
|
|
void DCDeviceData::setProduct(const QString &product)
|
2017-05-12 17:18:20 +00:00
|
|
|
{
|
2018-02-28 22:37:09 +00:00
|
|
|
data.product = copy_qstring(product);
|
2017-05-12 17:18:20 +00:00
|
|
|
}
|
|
|
|
|
2018-07-26 01:43:55 +00:00
|
|
|
void DCDeviceData::setDevName(const QString &devName)
|
2017-05-12 17:18:20 +00:00
|
|
|
{
|
2017-12-31 11:10:37 +00:00
|
|
|
// This is a workaround for bug #1002. A string of the form "devicename (deviceaddress)"
|
|
|
|
// or "deviceaddress (devicename)" may have found its way into the preferences.
|
|
|
|
// Try to fetch the address from such a string
|
|
|
|
// TODO: Remove this code in due course
|
|
|
|
if (data.bluetooth_mode) {
|
|
|
|
int idx1 = devName.indexOf('(');
|
|
|
|
int idx2 = devName.lastIndexOf(')');
|
|
|
|
if (idx1 >= 0 && idx2 >= 0 && idx2 > idx1) {
|
|
|
|
QString front = devName.left(idx1).trimmed();
|
|
|
|
QString back = devName.mid(idx1 + 1, idx2 - idx1 - 1);
|
|
|
|
QString newDevName = back.indexOf(':') >= 0 ? back : front;
|
|
|
|
qWarning() << "Found invalid bluetooth device" << devName << "corrected to" << newDevName << ".";
|
2018-02-28 22:37:09 +00:00
|
|
|
data.devname = copy_qstring(newDevName);
|
2017-12-31 11:10:37 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2018-02-28 22:37:09 +00:00
|
|
|
data.devname = copy_qstring(devName);
|
2017-05-12 17:18:20 +00:00
|
|
|
}
|
|
|
|
|
2020-03-15 01:11:46 +00:00
|
|
|
#if defined(Q_OS_ANDROID)
|
2020-03-15 22:12:30 +00:00
|
|
|
void DCDeviceData::setUsbDevice(const android_usb_serial_device_descriptor &usbDescriptor)
|
2020-03-15 01:11:46 +00:00
|
|
|
{
|
2020-03-15 22:12:30 +00:00
|
|
|
androidUsbDescriptor = usbDescriptor;
|
|
|
|
data.androidUsbDeviceDescriptor = &androidUsbDescriptor;
|
2020-03-15 01:11:46 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2018-07-26 01:43:55 +00:00
|
|
|
void DCDeviceData::setDevBluetoothName(const QString &name)
|
2017-11-12 11:33:20 +00:00
|
|
|
{
|
|
|
|
m_devBluetoothName = name;
|
|
|
|
}
|
|
|
|
|
2017-05-12 17:18:20 +00:00
|
|
|
void DCDeviceData::setBluetoothMode(bool mode)
|
|
|
|
{
|
|
|
|
data.bluetooth_mode = mode;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DCDeviceData::setForceDownload(bool force)
|
|
|
|
{
|
|
|
|
data.force_download = force;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DCDeviceData::setDeviceId(int deviceId)
|
|
|
|
{
|
|
|
|
data.deviceid = deviceId;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DCDeviceData::setDiveId(int diveId)
|
|
|
|
{
|
|
|
|
data.diveid = diveId;
|
|
|
|
}
|
2017-05-19 09:23:11 +00:00
|
|
|
|
|
|
|
void DCDeviceData::setSaveDump(bool save)
|
|
|
|
{
|
|
|
|
data.libdc_dump = save;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool DCDeviceData::saveDump() const
|
|
|
|
{
|
|
|
|
return data.libdc_dump;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DCDeviceData::setSaveLog(bool saveLog)
|
|
|
|
{
|
|
|
|
data.libdc_log = saveLog;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool DCDeviceData::saveLog() const
|
|
|
|
{
|
|
|
|
return data.libdc_log;
|
|
|
|
}
|
2018-06-09 10:31:31 +00:00
|
|
|
|
2018-07-26 01:43:55 +00:00
|
|
|
device_data_t *DCDeviceData::internalData()
|
2017-05-19 09:23:11 +00:00
|
|
|
{
|
|
|
|
return &data;
|
|
|
|
}
|
2017-06-06 02:41:57 +00:00
|
|
|
|
2017-08-26 19:27:12 +00:00
|
|
|
int DCDeviceData::getDetectedVendorIndex()
|
2017-06-06 02:41:57 +00:00
|
|
|
{
|
|
|
|
#if defined(BT_SUPPORT)
|
Mobile: wrap up fixes for BT download on Android
Major functional change in this commit is the addition of found static BT devices
to the internal administration (on Android), in a way that is equivalent to
mobile-on-desktop. So, in both cases, the list of devices in the app are
as in the list of devices on the host OS (Linux or Android). To minimize code
duplication, the btDeviceDiscovered slot is split in two parts, the part to
act as slot for the Qt BT discovery agent (Linux, so mobile-on-desktop), and
the part only needed for Android.
Remaining to be fixed: the correct handling of the QML UI selection of
vendor/product. The first default dive computer is correctly detected,
all paired devices from the virtual vendow can be selected, but clicking
through vendors results in non logical selections. It is obvious why
this is, but a fix is not straigforward at this point.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-12 08:38:24 +00:00
|
|
|
QList<BTDiscovery::btVendorProduct> btDCs = BTDiscovery::instance()->getBtDcs();
|
2017-06-10 08:09:56 +00:00
|
|
|
|
2017-07-17 14:43:31 +00:00
|
|
|
// Pick the vendor of the first confirmed find of a DC (if any)
|
|
|
|
if (!btDCs.isEmpty())
|
2017-06-06 02:41:57 +00:00
|
|
|
return btDCs.first().vendorIdx;
|
|
|
|
#endif
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2017-08-26 19:27:12 +00:00
|
|
|
int DCDeviceData::getDetectedProductIndex(const QString ¤tVendorText)
|
2017-06-06 02:41:57 +00:00
|
|
|
{
|
|
|
|
#if defined(BT_SUPPORT)
|
Mobile: wrap up fixes for BT download on Android
Major functional change in this commit is the addition of found static BT devices
to the internal administration (on Android), in a way that is equivalent to
mobile-on-desktop. So, in both cases, the list of devices in the app are
as in the list of devices on the host OS (Linux or Android). To minimize code
duplication, the btDeviceDiscovered slot is split in two parts, the part to
act as slot for the Qt BT discovery agent (Linux, so mobile-on-desktop), and
the part only needed for Android.
Remaining to be fixed: the correct handling of the QML UI selection of
vendor/product. The first default dive computer is correctly detected,
all paired devices from the virtual vendow can be selected, but clicking
through vendors results in non logical selections. It is obvious why
this is, but a fix is not straigforward at this point.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-12 08:38:24 +00:00
|
|
|
QList<BTDiscovery::btVendorProduct> btDCs = BTDiscovery::instance()->getBtDcs();
|
2017-06-10 08:09:56 +00:00
|
|
|
|
|
|
|
// Display in the QML UI, the first found dive computer that is been
|
|
|
|
// detected as a possible real dive computer (and not some other paired
|
2017-07-17 14:43:31 +00:00
|
|
|
// BT device)
|
|
|
|
if (!btDCs.isEmpty())
|
2017-06-06 02:41:57 +00:00
|
|
|
return btDCs.first().productIdx;
|
|
|
|
#endif
|
|
|
|
return -1;
|
|
|
|
}
|