Index: sources/bluetooth/BLEScanner.h
===================================================================
diff -u -rac16fe2e6ab8e5a7513ebea4959f5a7664238901 -rdca8a36ea292270c4de986c0f0872f1ee1e5f85a
--- sources/bluetooth/BLEScanner.h	(.../BLEScanner.h)	(revision ac16fe2e6ab8e5a7513ebea4959f5a7664238901)
+++ sources/bluetooth/BLEScanner.h	(.../BLEScanner.h)	(revision dca8a36ea292270c4de986c0f0872f1ee1e5f85a)
@@ -39,7 +39,6 @@
     QThread *_thread = nullptr;
     bool     _init   = false;
     const int _timerInterval = 1000; // SRSUI 6
-    int      _timerID = -1;
     bool     _timerIsActive = false;
     bool     _retryConnection = false;
 
@@ -69,7 +68,6 @@
 
     QList<QBluetoothDeviceInfo> devices;
     QBluetoothDeviceInfo selectedDeviceInfo;
-    QString macAddress = "";
     QBluetoothDeviceDiscoveryAgent *discoveryAgent;
     QLowEnergyController *lowEnergyController;
 
@@ -95,15 +93,13 @@
     void onInitConnections();
     void onQuitThread();
     void onConnectToDevice(const QBluetoothDeviceInfo& deviceInfo);
-    void onSetMacAddress(const QString &mac);
     void updateBLECuffCheckinType(bool retryConnection);
     void makeServiceConnections(QLowEnergyService *service);
     QLowEnergyService* setupService(const QBluetoothUuid &uuid);
     void timerEvent(QTimerEvent* event);
 
     // timer
-    int startBLETimer(int interval);
-    void killBLETimer(int id);
+    void toggleBLETimer(const bool &active);
 
 signals:
     void didReceiveBPMeasurement(BLEMeasurementData);
@@ -118,7 +114,7 @@
 
 public slots:
     bool doInit();
-    void doSelectDevice(const QString &addr);
+    void doSelectDevice(const QString &addr, const QString &name);
     void doScanForDevices();
     void doParseMeasurement(const QByteArray &byteArray);
     void doRequestBPMeasurement();