Update Bluetooth Configuration Usage

mavlink · Apr 18, 2024 · bc3baf2 · bc3baf2
1 parent 6becaa4
commit bc3baf2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/comm/BluetoothLink.cc b/src/comm/BluetoothLink.cc
@@ -22,7 +22,8 @@
 #include "LinkManager.h"
 
 BluetoothLink::BluetoothLink(SharedLinkConfigurationPtr& config)
-    : LinkInterface     (config)
+    : LinkInterface(config)
+    , _bluetoothConfig(qobject_cast<BluetoothConfiguration*>(config.get()))
 {
 
 }
@@ -111,7 +112,7 @@ bool BluetoothLink::_hardwareConnect()
     _discoveryAgent->start();
 #else
     _createSocket();
-    _targetSocket->connectToService(QBluetoothAddress(qobject_cast<BluetoothConfiguration*>(_config.get())->device().address), QBluetoothUuid(QBluetoothUuid::ServiceClassUuid::SerialPort));
+    _targetSocket->connectToService(QBluetoothAddress(_bluetoothConfig->device().address), QBluetoothUuid(QBluetoothUuid::ServiceClassUuid::SerialPort));
 #endif
     return true;
 }
@@ -137,7 +138,7 @@ void BluetoothLink::serviceDiscovered(const QBluetoothServiceInfo& info)
 {
     if(!info.device().name().isEmpty() && !_targetSocket)
     {
-        if(_config->device().uuid == info.device().deviceUuid() && _config->device().name == info.device().name())
+        if(_bluetoothConfig->device().uuid == info.device().deviceUuid() && _bluetoothConfig->device().name == info.device().name())
         {
             _createSocket();
             _targetSocket->connectToService(info);
@@ -157,7 +158,7 @@ void BluetoothLink::discoveryFinished()
         if(!_targetSocket)
         {
             _connectState = false;
-            emit communicationError("Could not locate Bluetooth device:", _config->device().name);
+            emit communicationError("Could not locate Bluetooth device:", _bluetoothConfig->device().name);
         }
     }
 }

diff --git a/src/comm/BluetoothLink.h b/src/comm/BluetoothLink.h
@@ -147,6 +147,7 @@ private slots:
     bool _hardwareConnect   (void);
     void _createSocket      (void);
 
+    BluetoothConfiguration*             _bluetoothConfig;
     QBluetoothSocket*                   _targetSocket    = nullptr;
 #ifdef Q_OS_IOS
     QBluetoothServiceDiscoveryAgent*    _discoveryAgent = nullptr;