summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-09-16 20:21:46 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-09-17 09:58:11 -0700
commit26e610c3f409e771c4e0e7ba955db7f4155b8825 (patch)
tree64a61900a1b2a903344a0237d9b2bc56d2c565be /core
parentdb38a7023db5ebf1c58e8bc652071d8f509bd001 (diff)
downloadsubsurface-26e610c3f409e771c4e0e7ba955db7f4155b8825.tar.gz
BLE: create controller from QBtDeviceInfo
Creating it from an address is a) deprecated and b) impossible on Mac or iOS. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core')
-rw-r--r--core/qt-ble.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/qt-ble.cpp b/core/qt-ble.cpp
index 9867528c8..eca615fbe 100644
--- a/core/qt-ble.cpp
+++ b/core/qt-ble.cpp
@@ -16,6 +16,7 @@
#include "libdivecomputer.h"
#include "core/qt-ble.h"
+#include "core/btdiscovery.h"
#if defined(SSRF_CUSTOM_IO)
@@ -287,12 +288,11 @@ dc_status_t qt_ble_open(dc_custom_io_t *io, dc_context_t *context, const char *d
if (!strncmp(devaddr, "LE:", 3))
devaddr += 3;
- QBluetoothAddress remoteDeviceAddress(devaddr);
-
// HACK ALERT! Qt 5.9 needs this for proper Bluez operation
qputenv("QT_DEFAULT_CENTRAL_SERVICES", "1");
- QLowEnergyController *controller = new QLowEnergyController(remoteDeviceAddress);
+ QBluetoothDeviceInfo remoteDevice = getBtDeviceInfo(devaddr);
+ QLowEnergyController *controller = QLowEnergyController::createCentral(remoteDevice);
qDebug() << "qt_ble_open(" << devaddr << ")";