From f0a764f2d4363b1c3615198b035c5b5d2bceb833 Mon Sep 17 00:00:00 2001
From: technyon <j.o.schuemann@gmx.de>
Date: Mon, 6 Feb 2023 19:23:32 +0100
Subject: [PATCH] delay ble watchdog if lock command is finished

---
 NukiOpenerWrapper.cpp | 12 ++++++++++++
 NukiOpenerWrapper.h   |  2 ++
 NukiWrapper.cpp       | 12 ++++++++++++
 NukiWrapper.h         |  3 ++-
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp
index 6d37364..091d1c2 100644
--- a/NukiOpenerWrapper.cpp
+++ b/NukiOpenerWrapper.cpp
@@ -220,6 +220,7 @@ void NukiOpenerWrapper::update()
                 _nextLockAction = (NukiOpener::LockAction) 0xff;
             }
         }
+        postponeBleWatchdog();
     }
 
     if(_clearAuthData)
@@ -280,12 +281,15 @@ void NukiOpenerWrapper::updateKeyTurnerState()
     {
         updateAuthData();
     }
+
+    postponeBleWatchdog();
 }
 
 void NukiOpenerWrapper::updateBatteryState()
 {
     _nukiOpener.requestBatteryReport(&_batteryReport);
     _network->publishBatteryReport(_batteryReport);
+    postponeBleWatchdog();
 }
 
 void NukiOpenerWrapper::updateConfig()
@@ -321,6 +325,12 @@ void NukiOpenerWrapper::updateAuthData()
     {
         _network->publishAuthorizationInfo(log);
     }
+    postponeBleWatchdog();
+}
+
+void NukiOpenerWrapper::postponeBleWatchdog()
+{
+    _disableBleWatchdogTs = millis() + 15000;
 }
 
 NukiOpener::LockAction NukiOpenerWrapper::lockActionToEnum(const char *str)
@@ -410,6 +420,7 @@ void NukiOpenerWrapper::readConfig()
     char resultStr[20];
     NukiOpener::cmdResultToString(result, resultStr);
     Log->println(resultStr);
+    postponeBleWatchdog();
 }
 
 void NukiOpenerWrapper::readAdvancedConfig()
@@ -420,6 +431,7 @@ void NukiOpenerWrapper::readAdvancedConfig()
     char resultStr[20];
     NukiOpener::cmdResultToString(result, resultStr);
     Log->println(resultStr);
+    postponeBleWatchdog();
 }
 
 void NukiOpenerWrapper::setupHASS()
diff --git a/NukiOpenerWrapper.h b/NukiOpenerWrapper.h
index 8290624..8d2710c 100644
--- a/NukiOpenerWrapper.h
+++ b/NukiOpenerWrapper.h
@@ -39,6 +39,7 @@ private:
     void updateBatteryState();
     void updateConfig();
     void updateAuthData();
+    void postponeBleWatchdog();
 
     void readConfig();
     void readAdvancedConfig();
@@ -85,5 +86,6 @@ private:
     unsigned long _nextPairTs = 0;
     long _nextRssiTs = 0;
     unsigned long _lastRssi = 0;
+    unsigned long _disableBleWatchdogTs = 0;
     NukiOpener::LockAction _nextLockAction = (NukiOpener::LockAction)0xff;
 };
diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp
index 499d7e9..ddaf762 100644
--- a/NukiWrapper.cpp
+++ b/NukiWrapper.cpp
@@ -136,6 +136,7 @@ void NukiWrapper::update()
     if(_restartBeaconTimeout > 0 &&
        ts > 60000 &&
        lastReceivedBeaconTs > 0 &&
+       _disableBleWatchdogTs < ts &&
        (ts - lastReceivedBeaconTs > _restartBeaconTimeout * 1000))
     {
         Log->print("No BLE beacon received from the lock for ");
@@ -233,6 +234,7 @@ void NukiWrapper::update()
                 _nextLockAction = (NukiLock::LockAction) 0xff;
             }
         }
+        postponeBleWatchdog();
     }
 
     if(_clearAuthData)
@@ -292,12 +294,15 @@ void NukiWrapper::updateKeyTurnerState()
     {
         updateAuthData();
     }
+
+    postponeBleWatchdog();
 }
 
 void NukiWrapper::updateBatteryState()
 {
     _nukiLock.requestBatteryReport(&_batteryReport);
     _network->publishBatteryReport(_batteryReport);
+    postponeBleWatchdog();
 }
 
 void NukiWrapper::updateConfig()
@@ -335,6 +340,7 @@ void NukiWrapper::updateAuthData()
     {
          _network->publishAuthorizationInfo(log);
     }
+    postponeBleWatchdog();
 }
 
 void NukiWrapper::updateKeypad()
@@ -363,6 +369,12 @@ void NukiWrapper::updateKeypad()
             _keypadCodeIds.push_back(entry.codeId);
         }
     }
+    postponeBleWatchdog();
+}
+
+void NukiWrapper::postponeBleWatchdog()
+{
+    _disableBleWatchdogTs = millis() + 15000;
 }
 
 NukiLock::LockAction NukiWrapper::lockActionToEnum(const char *str)
diff --git a/NukiWrapper.h b/NukiWrapper.h
index 6b03b30..eb050e5 100644
--- a/NukiWrapper.h
+++ b/NukiWrapper.h
@@ -44,12 +44,12 @@ private:
     void updateConfig();
     void updateAuthData();
     void updateKeypad();
+    void postponeBleWatchdog();
 
     void readConfig();
     void readAdvancedConfig();
     
     void setupHASS();
-
     bool hasDoorSensor();
 
     NukiLock::LockAction lockActionToEnum(const char* str); // char array at least 14 characters
@@ -98,5 +98,6 @@ private:
     unsigned long _nextKeypadUpdateTs = 0;
     unsigned long _nextRssiTs = 0;
     unsigned long _lastRssi = 0;
+    unsigned long _disableBleWatchdogTs = 0;
     NukiLock::LockAction _nextLockAction = (NukiLock::LockAction)0xff;
 };