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

Introduce mode field in Bluetooth device selection dialog

Browse source 
Some BT devices support both, classical and LE, modes. Users could
choose either by prepending or removing "LE:" in the device address
field. After commit d23bd46a1b, the
device field is always disabled in Bluetooth mode.

Therefore, add a mode combo box to the Bluetooth device selection
dialog. In the default mode (auto), the old code path (based on
the Qt device flags) is used. The two other modes (force LE, force
classical) allow the user to force the preferred behavior.

This feature is meant as a stop-gap measure until a more refined
transport choice is implemented. Therefore, the value of the new
combo box is not saved in the settings, to avoid cluttering of
the preferences with soon to be obsolete entries.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2017-11-13 22:46:42 +01:00 • committed by Lubomir I. Ivanov
parent a95825e95c
commit aca4a3a4fa
3 changed files with 124 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/btdiscovery.cpp
View file

@ -132,18 +132,20 @@ extern void addBtUuid(QBluetoothUuid uuid);
extern QHash<QString, QStringList> productList;
extern QStringList vendorList;
QString btDeviceAddress(const QBluetoothDeviceInfo *device, bool isBle)
{
QString address = device->address().isNull() ?
device->deviceUuid().toString() : device->address().toString();
const char *prefix = isBle ? "LE:" : "";
return prefix + address;
}
QString markBLEAddress(const QBluetoothDeviceInfo *device)
{
QBluetoothDeviceInfo::CoreConfigurations flags;
QString prefix = "";
QBluetoothDeviceInfo::CoreConfigurations flags = device->coreConfigurations();
bool isBle = flags == QBluetoothDeviceInfo::LowEnergyCoreConfiguration;
flags = device->coreConfigurations();
if (flags == QBluetoothDeviceInfo::LowEnergyCoreConfiguration)
prefix = "LE:";
if (device->address().isNull())
return prefix + device->deviceUuid().toString();
else
return prefix + device->address().toString();
return btDeviceAddress(device, isBle);
}
void BTDiscovery::btDeviceDiscovered(const QBluetoothDeviceInfo &device)