merge master

technyon · Jun 29, 2024 · 2f1dc82 · 2f1dc82
2 parents f65f23f + 0ebea6a
commit 2f1dc82
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/src/NukiBle.cpp b/src/NukiBle.cpp
@@ -87,6 +87,8 @@ PairingResult NukiBle::pairNuki(AuthorizationIdType idType) {
     return PairingResult::Success;
   }
   PairingResult result = PairingResult::Pairing;
+
+  if (pairingLastSeen < millis() - 2000) pairingServiceAvailable = false;
 
   if (pairingLastSeen < millis() - 2000) pairingServiceAvailable = false;
 
@@ -101,7 +103,7 @@ PairingResult NukiBle::pairNuki(AuthorizationIdType idType) {
       PairingState nukiPairingState = PairingState::InitPairing;
       do {
         nukiPairingState = pairStateMachine(nukiPairingState);
-        extendDisonnectTimeout();
+        extendDisconnectTimeout();
         delay(50);
       } while ((nukiPairingState != PairingState::Success) && (nukiPairingState != PairingState::Timeout));
 
@@ -112,6 +114,7 @@ PairingResult NukiBle::pairNuki(AuthorizationIdType idType) {
       } else {
         result = PairingResult::Timeout;
       }
+      extendDisconnectTimeout();
     }
   } else {
     #ifdef DEBUG_NUKI_CONNECT
@@ -213,7 +216,7 @@ void NukiBle::setConnectRetries(uint8_t retries) {
   connectRetries = retries;
 }
 
-void NukiBle::extendDisonnectTimeout() {
+void NukiBle::extendDisconnectTimeout() {
   lastStartTimeout = millis();
 }
 

diff --git a/src/NukiBle.h b/src/NukiBle.h
@@ -291,7 +291,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);

diff --git a/src/NukiBle.hpp b/src/NukiBle.hpp
@@ -33,7 +33,7 @@ Nuki::CmdResult NukiBle::executeAction(const TDeviceAction action) {
         Nuki::CmdResult result = cmdStateMachine(action);
         if (result != Nuki::CmdResult::Working) {
           giveNukiBleSemaphore();
-          extendDisonnectTimeout();
+          extendDisconnectTimeout();
           return result;
         }
         #ifndef NUKI_NO_WDT_RESET
@@ -46,7 +46,7 @@ Nuki::CmdResult NukiBle::executeAction(const TDeviceAction action) {
         Nuki::CmdResult result = cmdChallStateMachine(action);
         if (result != Nuki::CmdResult::Working) {
           giveNukiBleSemaphore();
-          extendDisonnectTimeout();
+          extendDisconnectTimeout();
           return result;
         }
         #ifndef NUKI_NO_WDT_RESET
@@ -59,7 +59,7 @@ Nuki::CmdResult NukiBle::executeAction(const TDeviceAction action) {
         Nuki::CmdResult result = cmdChallAccStateMachine(action);
         if (result != Nuki::CmdResult::Working) {
           giveNukiBleSemaphore();
-          extendDisonnectTimeout();
+          extendDisconnectTimeout();
           return result;
         }
         #ifndef NUKI_NO_WDT_RESET
@@ -72,7 +72,7 @@ Nuki::CmdResult NukiBle::executeAction(const TDeviceAction action) {
         Nuki::CmdResult result = cmdChallStateMachine(action, true);
         if (result != Nuki::CmdResult::Working) {
           giveNukiBleSemaphore();
-          extendDisonnectTimeout();
+          extendDisconnectTimeout();
           return result;
         }
         #ifndef NUKI_NO_WDT_RESET

diff --git a/src/NukiLock.cpp b/src/NukiLock.cpp
@@ -729,7 +729,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
@@ -645,7 +645,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 : {