From 9dd4d7e970fc1a1bb69bef3e879ee4d5609b7677 Mon Sep 17 00:00:00 2001 From: iranl Date: Fri, 10 Jan 2025 20:01:45 +0100 Subject: [PATCH] Change delays --- src/NukiBle.cpp | 9 +++------ src/NukiBle.hpp | 10 ++-------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/NukiBle.cpp b/src/NukiBle.cpp index e529a067..0fcc6990 100644 --- a/src/NukiBle.cpp +++ b/src/NukiBle.cpp @@ -182,7 +182,7 @@ PairingResult NukiBle::pairNuki(AuthorizationIdType idType) { do { nukiPairingState = pairStateMachine(nukiPairingState); extendDisconnectTimeout(); - delay(10); + delay(50); } while ((nukiPairingState != PairingState::Success) && (nukiPairingState != PairingState::Timeout)); if (nukiPairingState == PairingState::Success) { @@ -197,7 +197,6 @@ PairingResult NukiBle::pairNuki(AuthorizationIdType idType) { result = PairingResult::Timeout; } extendDisconnectTimeout(); - delay(10); } } else { if (debugNukiConnect) { @@ -226,6 +225,7 @@ void NukiBle::resetHost() { logMessageVar("[%s] Resetting BLE host", deviceName.c_str()); } + delay(10); ble_hs_sched_reset(0); delay(10); } @@ -473,9 +473,8 @@ void NukiBle::updateConnectionState() { } if (altConnect) { - delay(100); disconnect(); - delay(100); + delay(200); } else if (pClient && pClient->isConnected()) { pClient->disconnect(); @@ -1532,8 +1531,6 @@ void NukiBle::notifyCallback(BLERemoteCharacteristic* pBLERemoteCharacteristic, } void NukiBle::handleReturnMessage(Command returnCode, unsigned char* data, uint16_t dataLen) { - delay(10); - switch (returnCode) { case Command::RequestData : { if (debugNukiCommunication) { diff --git a/src/NukiBle.hpp b/src/NukiBle.hpp index 31c5583a..ed4056cd 100644 --- a/src/NukiBle.hpp +++ b/src/NukiBle.hpp @@ -35,7 +35,7 @@ Nuki::CmdResult NukiBle::executeAction(const TDeviceAction action) { while (1) { extendDisconnectTimeout(); - + Nuki::CmdResult result; if (action.cmdType == Nuki::CommandType::Command) { result = cmdStateMachine(action); @@ -74,9 +74,7 @@ Nuki::CmdResult NukiBle::executeAction(const TDeviceAction action) { template Nuki::CmdResult NukiBle::cmdStateMachine(const TDeviceAction action) { - extendDisconnectTimeout(); - delay(10); - + extendDisconnectTimeout(); switch (nukiCommandState) { case CommandState::Idle: { if (debugNukiCommunication) { @@ -161,8 +159,6 @@ Nuki::CmdResult NukiBle::cmdStateMachine(const TDeviceAction action) { template Nuki::CmdResult NukiBle::cmdChallStateMachine(const TDeviceAction action, const bool sendPinCode) { extendDisconnectTimeout(); - delay(10); - switch (nukiCommandState) { case CommandState::Idle: { if (debugNukiCommunication) { @@ -308,8 +304,6 @@ Nuki::CmdResult NukiBle::cmdChallStateMachine(const TDeviceAction action, const template Nuki::CmdResult NukiBle::cmdChallAccStateMachine(const TDeviceAction action) { extendDisconnectTimeout(); - delay(10); - switch (nukiCommandState) { case CommandState::Idle: { if (debugNukiCommunication) {