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"
2017-07-22 22:54:42 +00:00
# include "core/subsurface-qt/SettingsObjectWrapper.h"
2017-05-26 12:07:02 +00:00
# include <QDebug>
2017-07-04 00:28:27 +00:00
# include <QRegularExpression>
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 ) ;
const QString str = QString ( ) . vsprintf ( fmt , args ) ;
va_end ( args ) ;
return str ;
}
2017-06-08 11:38:52 +00:00
DownloadThread : : DownloadThread ( )
2017-04-18 17:14:03 +00:00
{
2017-06-08 11:38:52 +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 ( ) ;
internalData - > descriptor = descriptorLookup [ m_data - > vendor ( ) + m_data - > product ( ) ] ;
2018-07-26 01:43:55 +00:00
internalData - > download_table = & downloadTable ;
2017-05-29 22:05:46 +00:00
# if defined(Q_OS_ANDROID)
// on Android we either use BT or we download via FTDI cable
2017-05-31 00:47:22 +00:00
if ( ! internalData - > bluetooth_mode )
internalData - > devname = " ftdi " ;
2017-05-29 22:05:46 +00:00
# endif
qDebug ( ) < < " Starting download from " < < ( internalData - > bluetooth_mode ? " BT " : internalData - > devname ) ;
2017-05-26 14:40:50 +00:00
downloadTable . nr = 0 ;
2017-05-28 15:48:56 +00:00
dive_table . preexisting = dive_table . nr ;
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 {
qDebug ( ) < < " Finishing download thread: " < < downloadTable . nr < < " dives downloaded " ;
}
2017-07-22 22:54:42 +00:00
auto dcs = SettingsObjectWrapper : : instance ( ) - > dive_computer_settings ;
2018-07-22 14:19:22 +00:00
dcs - > set_vendor ( internalData - > vendor ) ;
dcs - > set_product ( internalData - > product ) ;
dcs - > set_device ( internalData - > devname ) ;
dcs - > set_device_name ( m_data - > devBluetoothName ( ) ) ;
2017-04-18 17:14:03 +00:00
}
2017-04-27 18:24:14 +00:00
2017-06-22 09:27:51 +00:00
static void fill_supported_mobile_list ( )
{
# if defined(Q_OS_ANDROID)
2018-04-19 10:15:49 +00:00
/* USB or FTDI devices that are supported on Android - this does NOT include the BLE or BT only devices */
2017-07-08 23:06:12 +00:00
mobileProductList [ " Aeris " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " 500 AI " } , { " A300 " } , { " A300 AI " } , { " A300CS " } , { " Atmos 2 " } , { " Atmos AI " } , { " Atmos AI 2 " } , { " Compumask " } , { " Elite " } , { " Elite T3 " } , { " Epic " } , { " F10 " } , { " F11 " } , { " Manta " } , { " XR-1 NX " } , { " XR-2 " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Aqualung " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " i200 " } , { " i300 " } , { " i450T " } , { " i550 " } , { " i750TC " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Beuchat " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " Mundial 2 " } , { " Mundial 3 " } , { " Voyager 2G " } } ) ;
2017-09-06 15:35:39 +00:00
mobileProductList [ " Cochran " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " Commander I " } , { " Commander II " } , { " Commander TM " } , { " EMC-14 " } , { " EMC-16 " } , { " EMC-20H " } } ) ;
2018-06-27 06:09:15 +00:00
mobileProductList [ " Cressi " ] =
2018-06-28 03:15:32 +00:00
QStringList ( { { " Leonardo " } , { " Giotto " } , { " Newton " } , { " Drake " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Genesis " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " React Pro " } , { " React Pro White " } } ) ;
2017-06-22 09:27:51 +00:00
mobileProductList [ " Heinrichs Weikamp " ] =
2018-03-14 08:03:31 +00:00
QStringList ( { { " Frog " } , { " OSTC " } , { " OSTC 2 " } , { " OSTC 2C " } , { " OSTC 2N " } , { " OSTC 3 " } , { " OSTC 3+ " } , { " OSTC 4 " } , { " OSTC Mk2 " } , { " OSTC Plus " } , { " OSTC Sport " } , { " OSTC cR " } , { " OSTC 2 TR " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Hollis " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " DG02 " } , { " DG03 " } , { " TX1 " } } ) ;
2018-04-13 04:14:23 +00:00
mobileProductList [ " Mares " ] =
QStringList ( { { " Puck Pro " } , { " Smart " } , { " Quad " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Oceanic " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " Atom 1.0 " } , { " Atom 2.0 " } , { " Atom 3.0 " } , { " Atom 3.1 " } , { " Datamask " } , { " F10 " } , { " F11 " } , { " Geo " } , { " Geo 2.0 " } , { " OC1 " } , { " OCS " } , { " OCi " } , { " Pro Plus 2 " } , { " Pro Plus 2.1 " } , { " Pro Plus 3 " } , { " VT 4.1 " } , { " VT Pro " } , { " VT3 " } , { " VT4 " } , { " VTX " } , { " Veo 1.0 " } , { " Veo 180 " } , { " Veo 2.0 " } , { " Veo 200 " } , { " Veo 250 " } , { " Veo 3.0 " } , { " Versa Pro " } } ) ;
2017-07-03 04:57:08 +00:00
mobileProductList [ " Scubapro " ] =
2018-04-19 10:15:49 +00:00
QStringList ( { { " Aladin Square " } , { " G2 " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Seemann " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " XP5 " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Sherwood " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " Amphos " } , { " Amphos Air " } , { " Insight " } , { " Insight 2 " } , { " Vision " } , { " Wisdom " } , { " Wisdom 2 " } , { " Wisdom 3 " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Subgear " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " XP-Air " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Suunto " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " Cobra " } , { " Cobra 2 " } , { " Cobra 3 " } , { " D3 " } , { " D4 " } , { " D4f " } , { " D4i " } , { " D6 " } , { " D6i " } , { " D9 " } , { " D9tx " } , { " DX " } , { " EON Core " } , { " EON Steel " } , { " Eon " } , { " Gekko " } , { " HelO2 " } , { " Mosquito " } , { " Solution " } , { " Solution Alpha " } , { " Solution Nitrox " } , { " Spyder " } , { " Stinger " } , { " Vyper " } , { " Vyper 2 " } , { " Vyper Air " } , { " Vyper Novo " } , { " Vytec " } , { " Zoop " } , { " Zoop Novo " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Tusa " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " Element II (IQ-750) " } , { " Zen (IQ-900) " } , { " Zen Air (IQ-950) " } } ) ;
2017-07-08 23:06:12 +00:00
mobileProductList [ " Uwatec " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " Aladin Air Twin " } , { " Aladin Air Z " } , { " Aladin Air Z Nitrox " } , { " Aladin Air Z O2 " } , { " Aladin Pro " } , { " Aladin Pro Ultra " } , { " Aladin Sport Plus " } , { " Memomouse " } } ) ;
2017-10-15 17:09:44 +00:00
mobileProductList [ " Atomic Aquatics " ] =
2017-11-27 06:20:17 +00:00
QStringList ( { { " Cobalt " } , { " Cobalt 2 " } } ) ;
2017-06-22 09:27:51 +00:00
# endif
}
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-06-22 09:27:51 +00:00
fill_supported_mobile_list ( ) ;
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 ) ;
2018-04-19 10:15:49 +00:00
# if defined(Q_OS_ANDROID)
if ( ( transports & ~ ( DC_TRANSPORT_SERIAL | DC_TRANSPORT_USB | DC_TRANSPORT_USBHID ) ) = = 0 )
// if the only available transports are serial/USB, then check against
// the ones that we explicitly support on Android
if ( ! mobileProductList . contains ( vendor ) | | ! mobileProductList [ vendor ] . contains ( product ) )
continue ;
2017-06-22 09:27:51 +00:00
# endif
2017-04-27 18:24:14 +00:00
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
descriptorLookup [ QString ( vendor ) + QString ( product ) ] = descriptor ;
}
dc_iterator_free ( iterator ) ;
Q_FOREACH ( QString vendor , vendorList )
qSort ( productList [ vendor ] ) ;
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 ;
if ( ! vendorList . contains ( " Uemis " ) )
vendorList . append ( " Uemis " ) ;
if ( ! productList [ " Uemis " ] . contains ( " Zurich " ) )
productList [ " Uemis " ] . push_back ( " Zurich " ) ;
descriptorLookup [ " UemisZurich " ] = ( dc_descriptor_t * ) mydescriptor ;
2017-06-22 09:27:51 +00:00
# endif
2017-04-27 18:24:14 +00:00
qSort ( vendorList ) ;
}
2017-05-12 17:18:20 +00:00
2018-05-12 18:22:54 +00:00
# define NUMTRANSPORTS 6
static QString transportStringTable [ NUMTRANSPORTS ] = {
QStringLiteral ( " SERIAL " ) ,
QStringLiteral ( " USB " ) ,
QStringLiteral ( " USBHID " ) ,
QStringLiteral ( " IRDA " ) ,
QStringLiteral ( " BT " ) ,
QStringLiteral ( " BLE " )
} ;
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-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 ] ) {
2018-05-12 18:22:54 +00:00
dc_descriptor_t * descriptor = descriptorLookup [ vendor + product ] ;
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
DCDeviceData * DCDeviceData : : m_instance = NULL ;
2018-06-09 14:59:02 +00:00
DCDeviceData : : DCDeviceData ( )
2017-05-19 09:23:11 +00:00
{
memset ( & data , 0 , sizeof ( data ) ) ;
data . trip = nullptr ;
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 . create_new_trip = 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
2017-12-28 06:02:12 +00:00
if ( m_instance ) {
qDebug ( ) < < " already have an instance of DCDevieData " ;
return ;
}
m_instance = this ;
2017-05-19 09:23:11 +00:00
}
2017-06-06 02:41:57 +00:00
DCDeviceData * DCDeviceData : : instance ( )
{
if ( ! m_instance )
2018-06-09 14:59:02 +00:00
m_instance = new DCDeviceData ;
2017-06-06 02:41:57 +00:00
return m_instance ;
}
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 )
{
2017-07-22 22:54:42 +00:00
auto dcs = SettingsObjectWrapper : : instance ( ) - > dive_computer_settings ;
2018-07-22 14:19:22 +00:00
if ( dcs - > vendor ( ) = = vendor & &
dcs - > product ( ) = = product ) {
2017-07-22 22:54:42 +00:00
// we are trying to show the last dive computer selected
for ( int i = 0 ; i < connectionListModel . rowCount ( ) ; i + + ) {
QString address = connectionListModel . address ( i ) ;
2018-07-22 14:19:22 +00:00
if ( address . contains ( dcs - > device ( ) ) )
2017-07-22 22:54:42 +00:00
return i ;
}
}
2017-07-17 04:49:11 +00:00
for ( int i = 0 ; i < connectionListModel . rowCount ( ) ; i + + ) {
QString address = connectionListModel . address ( i ) ;
if ( address . contains ( product ) )
return i ;
}
return - 1 ;
}
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 ;
}
bool DCDeviceData : : createNewTrip ( ) const
{
return data . create_new_trip ;
}
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
}
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 : : setCreateNewTrip ( bool create )
{
data . create_new_trip = create ;
}
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
2017-05-19 09:23:11 +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
{
2017-07-22 22:54:42 +00:00
auto dcs = SettingsObjectWrapper : : instance ( ) - > dive_computer_settings ;
2018-07-22 14:19:22 +00:00
if ( ! dcs - > vendor ( ) . isEmpty ( ) ) {
2017-07-22 22:54:42 +00:00
// use the last one
for ( int i = 0 ; i < vendorList . length ( ) ; i + + ) {
2018-07-22 14:19:22 +00:00
if ( vendorList [ i ] = = dcs - > vendor ( ) )
2017-07-22 22:54:42 +00:00
return i ;
}
}
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 & currentVendorText )
2017-06-06 02:41:57 +00:00
{
2017-07-22 22:54:42 +00:00
auto dcs = SettingsObjectWrapper : : instance ( ) - > dive_computer_settings ;
2018-07-22 14:19:22 +00:00
if ( ! dcs - > vendor ( ) . isEmpty ( ) ) {
if ( dcs - > vendor ( ) = = currentVendorText ) {
2017-07-22 22:54:42 +00:00
// we are trying to show the last dive computer selected
for ( int i = 0 ; i < productList [ currentVendorText ] . length ( ) ; i + + ) {
2018-07-22 14:19:22 +00:00
if ( productList [ currentVendorText ] [ i ] = = dcs - > product ( ) )
2017-07-22 22:54:42 +00:00
return i ;
}
}
}
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 ;
}