Merge pull request #427 from jmlich/pair-instead-connect

pair function shoud invoke QBLEDevice::pair()
piggz · Nov 22, 2024 · 5d07488 · 5d07488
2 parents 540f783 + 932260b
commit 5d07488
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/daemon/src/devices/asteroidosdevice.cpp b/daemon/src/devices/asteroidosdevice.cpp
@@ -78,7 +78,7 @@ void AsteroidOSDevice::pair()
     setConnectionState("pairing");
     emit connectionStateChanged();
 
-    QBLEDevice::connectToDevice();
+    QBLEDevice::pair();
 }
 
 

diff --git a/daemon/src/devices/banglejsdevice.cpp b/daemon/src/devices/banglejsdevice.cpp
@@ -20,7 +20,7 @@ void BangleJSDevice::pair()
     setConnectionState("pairing");
     emit connectionStateChanged();
 
-    QBLEDevice::connectToDevice();
+    QBLEDevice::pair();
 }
 
 int BangleJSDevice::supportedFeatures() const

diff --git a/daemon/src/devices/pinetimejfdevice.cpp b/daemon/src/devices/pinetimejfdevice.cpp
@@ -58,14 +58,15 @@ void PinetimeJFDevice::pair()
 {
     qDebug() << Q_FUNC_INFO;
 
-    m_needsAuth = false;
+    m_needsAuth = true;
     m_pairing = true;
     m_autoreconnect = true;
-    //disconnectFromDevice();
+    disconnectFromDevice();
     setConnectionState("pairing");
     emit connectionStateChanged();
 
-    QBLEDevice::connectToDevice();
+    QBLEDevice::pair();
+
 }
 
 int PinetimeJFDevice::supportedFeatures() const