Improve pairing reliability and speed

technyon · Jun 18, 2024 · 1087910 · 1087910
1 parent 1c0ecf3
commit 1087910
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/src/NukiBle.cpp b/src/NukiBle.cpp
@@ -77,14 +77,17 @@ PairingResult NukiBle::pairNuki(AuthorizationIdType idType) {
 
   if (retrieveCredentials()) {
     #ifdef DEBUG_NUKI_CONNECT
-    log_d("Allready paired");
+    log_d("Already paired");
     #endif
     isPaired = true;
     return PairingResult::Success;
   }
   PairingResult result = PairingResult::Pairing;
+
+  if (pairingLastSeen < millis() - 2000) pairingServiceAvailable = false;
 
   if (pairingServiceAvailable && bleAddress != BLEAddress("")) {
+    pairingServiceAvailable = false;
     #ifdef DEBUG_NUKI_CONNECT
     log_d("Nuki in pairing mode found");
     #endif
@@ -94,6 +97,7 @@ PairingResult NukiBle::pairNuki(AuthorizationIdType idType) {
       PairingState nukiPairingState = PairingState::InitPairing;
       do {
         nukiPairingState = pairStateMachine(nukiPairingState);
+        extendDisconnectTimeout();
         delay(50);
       } while ((nukiPairingState != PairingState::Success) && (nukiPairingState != PairingState::Timeout));
 
@@ -104,7 +108,7 @@ PairingResult NukiBle::pairNuki(AuthorizationIdType idType) {
       } else {
         result = PairingResult::Timeout;
       }
-      extendDisonnectTimeout();
+      extendDisconnectTimeout();
     }
   } else {
     #ifdef DEBUG_NUKI_CONNECT
@@ -196,7 +200,7 @@ void NukiBle::setConnectRetries(uint8_t retries) {
   connectRetries = retries;
 }
 
-void NukiBle::extendDisonnectTimeout() {
+void NukiBle::extendDisconnectTimeout() {
   lastStartTimeout = millis();
 }
 
@@ -259,8 +263,7 @@ void NukiBle::onResult(BLEAdvertisedDevice* advertisedDevice) {
         #endif
         bleAddress = advertisedDevice->getAddress();
         pairingServiceAvailable = true;
-      } else {
-        pairingServiceAvailable = false;
+        pairingLastSeen = millis();
       }
     }
   }

diff --git a/src/NukiBle.h b/src/NukiBle.h
@@ -283,7 +283,7 @@ class NukiBle : public BLEClientCallbacks, public BleScanner::Subscriber {
 
   protected:
     bool connectBle(const BLEAddress bleAddress);
-    void extendDisonnectTimeout();
+    void extendDisconnectTimeout();
 
     template <typename TDeviceAction>
     Nuki::CmdResult executeAction(const TDeviceAction action);
@@ -319,6 +319,7 @@ class NukiBle : public BLEClientCallbacks, public BleScanner::Subscriber {
     uint16_t timeoutDuration = 1000;
     uint8_t connectTimeoutSec = 1;
     uint8_t connectRetries = 5;
+    unsigned long pairingLastSeen = 0;
 
     void onConnect(BLEClient*) override;
     void onDisconnect(BLEClient*) override;

diff --git a/src/NukiBle.hpp b/src/NukiBle.hpp
@@ -32,7 +32,7 @@ Nuki::CmdResult NukiBle::executeAction(const TDeviceAction action) {
         Nuki::CmdResult result = cmdStateMachine(action);
         if (result != Nuki::CmdResult::Working) {
           giveNukiBleSemaphore();
-          extendDisonnectTimeout();
+          extendDisconnectTimeout();
           return result;
         }
         esp_task_wdt_reset();
@@ -43,7 +43,7 @@ Nuki::CmdResult NukiBle::executeAction(const TDeviceAction action) {
         Nuki::CmdResult result = cmdChallStateMachine(action);
         if (result != Nuki::CmdResult::Working) {
           giveNukiBleSemaphore();
-          extendDisonnectTimeout();
+          extendDisconnectTimeout();
           return result;
         }
         esp_task_wdt_reset();
@@ -54,7 +54,7 @@ Nuki::CmdResult NukiBle::executeAction(const TDeviceAction action) {
         Nuki::CmdResult result = cmdChallAccStateMachine(action);
         if (result != Nuki::CmdResult::Working) {
           giveNukiBleSemaphore();
-          extendDisonnectTimeout();
+          extendDisconnectTimeout();
           return result;
         }
         esp_task_wdt_reset();
@@ -65,7 +65,7 @@ Nuki::CmdResult NukiBle::executeAction(const TDeviceAction action) {
         Nuki::CmdResult result = cmdChallStateMachine(action, true);
         if (result != Nuki::CmdResult::Working) {
           giveNukiBleSemaphore();
-          extendDisonnectTimeout();
+          extendDisconnectTimeout();
           return result;
         }
         esp_task_wdt_reset();

diff --git a/src/NukiLock.cpp b/src/NukiLock.cpp
@@ -758,7 +758,7 @@ void NukiLock::createNewAdvancedConfig(const AdvancedConfig* oldConfig, NewAdvan
 }
 
 void NukiLock::handleReturnMessage(Command returnCode, unsigned char* data, uint16_t dataLen) {
-  extendDisonnectTimeout();
+  extendDisconnectTimeout();
 
   switch (returnCode) {
     case Command::KeyturnerStates : {

diff --git a/src/NukiOpener.cpp b/src/NukiOpener.cpp
@@ -646,7 +646,7 @@ void NukiOpener::createNewAdvancedConfig(const AdvancedConfig* oldConfig, NewAdv
 
 
 void NukiOpener::handleReturnMessage(Command returnCode, unsigned char* data, uint16_t dataLen) {
-  extendDisonnectTimeout();
+  extendDisconnectTimeout();
 
   switch (returnCode) {
     case Command::KeyturnerStates : {