From 5c43f098ceba15013b0b52989b6479fafdf0bf65 Mon Sep 17 00:00:00 2001
From: technyon <j.o.schuemann@gmx.de>
Date: Wed, 1 Jun 2022 19:08:42 +0200
Subject: [PATCH] disable shared timeout

---
 NukiOpenerWrapper.cpp | 7 +++----
 NukiOpenerWrapper.h   | 3 +--
 NukiWrapper.cpp       | 7 +++----
 NukiWrapper.h         | 3 +--
 main.cpp              | 8 ++------
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp
index 0ff1a5d..d1fb526 100644
--- a/NukiOpenerWrapper.cpp
+++ b/NukiOpenerWrapper.cpp
@@ -6,13 +6,12 @@
 
 NukiOpenerWrapper* nukiOpenerInst;
 
-NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, uint32_t id, BleScanner::Scanner* scanner,  NetworkOpener* network, Preferences* preferences, Nuki::NukiTimeout* nukiTimeout)
+NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, uint32_t id, BleScanner::Scanner* scanner,  NetworkOpener* network, Preferences* preferences)
 : _deviceName(deviceName),
-  _nukiOpener(deviceName, id, nukiTimeout),
+  _nukiOpener(deviceName, id),
   _bleScanner(scanner),
   _network(network),
-  _preferences(preferences),
-  _nukiTimeout(nukiTimeout)
+  _preferences(preferences)
 {
     nukiOpenerInst = this;
 
diff --git a/NukiOpenerWrapper.h b/NukiOpenerWrapper.h
index c2626d1..40d148e 100644
--- a/NukiOpenerWrapper.h
+++ b/NukiOpenerWrapper.h
@@ -9,7 +9,7 @@
 class NukiOpenerWrapper : public NukiOpener::SmartlockEventHandler
 {
 public:
-    NukiOpenerWrapper(const std::string& deviceName,  uint32_t id,  BleScanner::Scanner* scanner, NetworkOpener* network, Preferences* preferences, Nuki::NukiTimeout* nukiTimeout);
+    NukiOpenerWrapper(const std::string& deviceName,  uint32_t id,  BleScanner::Scanner* scanner, NetworkOpener* network, Preferences* preferences);
     virtual ~NukiOpenerWrapper();
 
     void initialize();
@@ -46,7 +46,6 @@ private:
     BleScanner::Scanner* _bleScanner;
     NetworkOpener* _network;
     Preferences* _preferences;
-    Nuki::NukiTimeout* _nukiTimeout;
     int _intervalLockstate = 0; // seconds
     int _intervalBattery = 0; // seconds
     int _intervalConfig = 60 * 60; // seconds
diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp
index 7fc5038..4c811e9 100644
--- a/NukiWrapper.cpp
+++ b/NukiWrapper.cpp
@@ -6,12 +6,11 @@
 
 NukiWrapper* nukiInst;
 
-NukiWrapper::NukiWrapper(const std::string& deviceName, uint32_t id, Network* network, Preferences* preferences, Nuki::NukiTimeout* nukiTimeout)
+NukiWrapper::NukiWrapper(const std::string& deviceName, uint32_t id, Network* network, Preferences* preferences)
 : _deviceName(deviceName),
-  _nukiBle(deviceName, id, nukiTimeout),
+  _nukiBle(deviceName, id),
   _network(network),
-  _preferences(preferences),
-  _nukiTimeout(nukiTimeout)
+  _preferences(preferences)
 {
     nukiInst = this;
 
diff --git a/NukiWrapper.h b/NukiWrapper.h
index 630352d..122cee6 100644
--- a/NukiWrapper.h
+++ b/NukiWrapper.h
@@ -9,7 +9,7 @@
 class NukiWrapper : public Nuki::SmartlockEventHandler
 {
 public:
-    NukiWrapper(const std::string& deviceName, uint32_t id, Network* network, Preferences* preferences, Nuki::NukiTimeout* nukiTimeout);
+    NukiWrapper(const std::string& deviceName, uint32_t id, Network* network, Preferences* preferences);
     virtual ~NukiWrapper();
 
     void initialize();
@@ -46,7 +46,6 @@ private:
     BleScanner::Scanner* _bleScanner;
     Network* _network;
     Preferences* _preferences;
-    Nuki::NukiTimeout* _nukiTimeout;
     int _intervalLockstate = 0; // seconds
     int _intervalBattery = 0; // seconds
     int _intervalConfig = 60 * 60; // seconds
diff --git a/main.cpp b/main.cpp
index eaa6301..9bde357 100644
--- a/main.cpp
+++ b/main.cpp
@@ -13,7 +13,6 @@
 Network* network = nullptr;
 NetworkOpener* networkOpener = nullptr;
 WebCfgServer* webCfgServer = nullptr;
-Nuki::NukiTimeout* nukiTimeout = nullptr;
 NukiWrapper* nuki = nullptr;
 NukiOpenerWrapper* nukiOpener = nullptr;
 PresenceDetection* presenceDetection = nullptr;
@@ -37,7 +36,6 @@ void nukiTask(void *pvParameters)
     {
         nuki->update();
         nukiOpener->update();
-        nukiTimeout->update();
     }
 }
 
@@ -128,12 +126,10 @@ void setup()
 
     initEthServer(networkDevice);
 
-    nukiTimeout = new Nuki::NukiTimeout();
-
-    nuki = new NukiWrapper("NukiHub", deviceId, network, preferences, nukiTimeout);
+    nuki = new NukiWrapper("NukiHub", deviceId, network, preferences);
     nuki->initialize();
 
-    nukiOpener = new NukiOpenerWrapper("NukiHub", deviceId, nuki->bleScanner(), networkOpener, preferences, nukiTimeout);
+    nukiOpener = new NukiOpenerWrapper("NukiHub", deviceId, nuki->bleScanner(), networkOpener, preferences);
     nukiOpener->initialize();
 
     webCfgServer = new WebCfgServer(nuki, network, ethServer, preferences, networkDevice == NetworkDeviceType::WiFi);