From a9a2bc6f7b83bec72d92b37fc571d90321830507 Mon Sep 17 00:00:00 2001
From: technyon <j.o.schuemann@gmx.de>
Date: Sat, 26 Mar 2022 11:30:39 +0100
Subject: [PATCH] fix lock action crash

---
 Nuki.cpp | 35 ++++++++++++-----------------------
 Nuki.h   |  2 ++
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/Nuki.cpp b/Nuki.cpp
index e335314..6a71c38 100644
--- a/Nuki.cpp
+++ b/Nuki.cpp
@@ -36,32 +36,26 @@ void Nuki::update()
             vTaskDelay( 200 / portTICK_PERIOD_MS);
             return;
         }
-
-        vTaskDelay( 100 / portTICK_PERIOD_MS);
-
-
-//        Config config;
-//        uint8_t  res = _nukiBle.requestConfig(&config, false);
-//        Serial.print("Result: ");
-//        Serial.println(res);
-//        Serial.print("Time: ");
-//        Serial.print(config.currentTimeHour);
-//        Serial.print(":");
-//        Serial.println(config.currentTimeMinute);
     }
 
-    vTaskDelay( 100 / portTICK_PERIOD_MS);
+    vTaskDelay( 200 / portTICK_PERIOD_MS);
 
     unsigned long ts = millis();
 
-    updateKeyTurnerState();
+    if(_lastLockStateUpdateTs == 0 || _lastLockStateUpdateTs + 60000 < ts)
+    {
+        _lastLockStateUpdateTs = ts;
+        updateKeyTurnerState();
+    }
     if(_lastBatteryReportTs == 0 || _lastBatteryReportTs + 600000 < ts)
     {
         _lastBatteryReportTs = ts;
         updateBatteryState();
     }
-
-    vTaskDelay( 60000 / portTICK_PERIOD_MS);
+    if(_nextLockAction != (LockAction)0xff)
+    {
+         _nukiBle.lockAction(_nextLockAction, 0, 0);
+    }
 }
 
 
@@ -155,12 +149,7 @@ LockAction Nuki::lockActionToEnum(const char *str)
 
 void Nuki::onLockActionReceived(const char *value)
 {
-    LockAction action =  nukiInst->lockActionToEnum(value);
+    nukiInst->_nextLockAction = nukiInst->lockActionToEnum(value);
     Serial.print("Action: ");
-    Serial.println((int)action);
-    if(action != (LockAction)0xff)
-    {
-        nukiInst->_nukiBle.lockAction(action, 0, 0);
-        vTaskDelay( 5000 / portTICK_PERIOD_MS);
-    }
+    Serial.println((int)nukiInst->_nextLockAction);
 }
diff --git a/Nuki.h b/Nuki.h
index 662e9b4..13780a9 100644
--- a/Nuki.h
+++ b/Nuki.h
@@ -31,5 +31,7 @@ private:
     BatteryReport _lastBatteryReport;
 
     bool _paired = false;
+    unsigned long _lastLockStateUpdateTs = 0;
     unsigned long _lastBatteryReportTs = 0;
+    LockAction _nextLockAction = (LockAction)0xff;
 };