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

QML UI: save BT address as string

Browse source 
And do the same LE: prefix marking as in the desktop version.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-06-29 19:47:51 -07:00
parent 6837120bb1
commit c145cbd754
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/btdiscovery.cpp
View file

@ -72,7 +72,7 @@ BTDiscovery::BTDiscovery(QObject *parent)
} }
#endif #endif
for (int i = 0; i < btPairedDevices.length(); i++) { for (int i = 0; i < btPairedDevices.length(); i++) {
qDebug() << "Paired =" << btPairedDevices[i].name << btPairedDevices[i].address.toString(); qDebug() << "Paired =" << btPairedDevices[i].name << btPairedDevices[i].address;
} }
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
discoveryAgent->stop(); discoveryAgent->stop();
@ -121,7 +121,7 @@ void BTDiscovery::btDeviceDiscovered(const QBluetoothDeviceInfo &device)
{ {
#if defined(SSRF_CUSTOM_IO) #if defined(SSRF_CUSTOM_IO)
btPairedDevice this_d; btPairedDevice this_d;
this_d.address = device.address(); this_d.address = markBLEAddress(&device);
this_d.name = device.name(); this_d.name = device.name();
btPairedDevices.append(this_d); btPairedDevices.append(this_d);
@ -161,7 +161,7 @@ void BTDiscovery::btDeviceDiscoveredMain(const btPairedDevice &device)
break; break;
} }
} }
productList[QObject::tr("Paired Bluetooth Devices")].append(device.name + " (" + device.address.toString() + ")"); productList[QObject::tr("Paired Bluetooth Devices")].append(device.name + " (" + device.address + ")");
btVP.btpdi = device; btVP.btpdi = device;
btVP.dcDescriptor = newDC; btVP.dcDescriptor = newDC;
@ -218,7 +218,7 @@ void BTDiscovery::getBluetoothDevices()
continue; continue;
} }
result.address = QBluetoothAddress(dev.callObjectMethod("getAddress","()Ljava/lang/String;").toString()); result.address = dev.callObjectMethod("getAddress","()Ljava/lang/String;").toString();
result.name = dev.callObjectMethod("getName", "()Ljava/lang/String;").toString(); result.name = dev.callObjectMethod("getName", "()Ljava/lang/String;").toString();
btPairedDevices.append(result); btPairedDevices.append(result);

2
core/btdiscovery.h
View file

@ -27,7 +27,7 @@ public:
#if defined(BT_SUPPORT) #if defined(BT_SUPPORT)
struct btPairedDevice { struct btPairedDevice {
QBluetoothAddress address; QString address;
QString name; QString name;
}; };

4
core/downloadfromdcthread.cpp
View file

@ -331,7 +331,7 @@ QString DCDeviceData::getDetectedDeviceAddress(const QString &currentVendorText,
// detected as a possible real dive computer (and not some other paired // detected as a possible real dive computer (and not some other paired
// BT device // BT device
if (currentVendorText != QObject::tr("Paired Bluetooth Devices") && !btDCs.isEmpty()) { if (currentVendorText != QObject::tr("Paired Bluetooth Devices") && !btDCs.isEmpty()) {
QString btAddr = btDCs.first().btpdi.address.toString(); QString btAddr = btDCs.first().btpdi.address;
qDebug() << "getDetectedDeviceAddress" << btAddr; qDebug() << "getDetectedDeviceAddress" << btAddr;
return btAddr; return btAddr;
} }
@ -340,7 +340,7 @@ QString DCDeviceData::getDetectedDeviceAddress(const QString &currentVendorText,
// unsure being a dive computer // unsure being a dive computer
if (currentVendorText == QObject::tr("Paired Bluetooth Devices")) { if (currentVendorText == QObject::tr("Paired Bluetooth Devices")) {
int i = productList[currentVendorText].indexOf(currentProductText); int i = productList[currentVendorText].indexOf(currentProductText);
QString btAddr = btAllDevices[i].btpdi.address.toString(); QString btAddr = btAllDevices[i].btpdi.address;
qDebug() << "getDetectedDeviceAddress" << btAddr; qDebug() << "getDetectedDeviceAddress" << btAddr;
return btAddr; return btAddr;
} }