Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable shared timeout

Browse Source
This commit is contained in:
technyon
2022-06-01 19:08:42 +02:00
parent cc21427d73
commit 5c43f098ce
5 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
NukiOpenerWrapper.cpp
View File

@@ -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;

3
NukiOpenerWrapper.h
View File

@@ -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

7
NukiWrapper.cpp
View File

@@ -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;

3
NukiWrapper.h
View File

@@ -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

8
main.cpp
View File

@@ -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);