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

Update

Browse Source
This commit is contained in:
iranl
2024-03-12 20:24:17 +01:00
parent 742186f3d5
commit 5d545e5704
4 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
NukiOpenerWrapper.cpp
View File

@@ -7,6 +7,7 @@
#include <NukiOpenerUtils.h> #include <NukiOpenerUtils.h>
NukiOpenerWrapper* nukiOpenerInst; NukiOpenerWrapper* nukiOpenerInst;
Preferences* nukiOpenerPreferences = nullptr;
NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, NukiDeviceId* deviceId, BleScanner::Scanner* scanner, NetworkOpener* network, Gpio* gpio, Preferences* preferences) NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, NukiDeviceId* deviceId, BleScanner::Scanner* scanner, NetworkOpener* network, Gpio* gpio, Preferences* preferences)
: _deviceName(deviceName), : _deviceName(deviceName),
@@ -60,15 +61,6 @@ void NukiOpenerWrapper::initialize()
_retryDelay = _preferences->getInt(preference_command_retry_delay); _retryDelay = _preferences->getInt(preference_command_retry_delay);
_rssiPublishInterval = _preferences->getInt(preference_rssi_publish_interval) * 1000; _rssiPublishInterval = _preferences->getInt(preference_rssi_publish_interval) * 1000;
_aclActRTO = _preferences->getBool(preference_acl_act_rto);
_aclDeactRTO = _preferences->getBool(preference_acl_deact_rto);
_aclESA = _preferences->getBool(preference_acl_act_esa);
_aclActCM = _preferences->getBool(preference_acl_act_cm);
_aclDeactCM = _preferences->getBool(preference_acl_deact_cm);
_aclFob1 = _preferences->getBool(preference_acl_opn_fob1);
_aclFob2 = _preferences->getBool(preference_acl_opn_fob2);
_aclFob3 = _preferences->getBool(preference_acl_opn_fob3);
if(_retryDelay <= 100) if(_retryDelay <= 100)
{ {
_retryDelay = 100; _retryDelay = 100;
@@ -499,11 +491,16 @@ LockActionResult NukiOpenerWrapper::onLockActionReceivedCallback(const char *val
return LockActionResult::UnknownAction; return LockActionResult::UnknownAction;
} }
if((action == NukiOpener::LockAction::ActivateRTO && _preferences->getBool(preference_acl_act_rto)) || (action == NukiOpener::LockAction::DeactivateRTO && _preferences->getBool(preference_acl_deact_rto)) || (action == NukiOpener::LockAction::ElectricStrikeActuation && _preferences->getBool(preference_acl_act_esa)) || (action == NukiOpener::LockAction::ActivateCM && _preferences->getBool(preference_acl_act_cm)) || (action == NukiOpener::LockAction::DeactivateCM && _preferences->getBool(preference_acl_deact_cm)) || (action == NukiOpener::LockAction::FobAction1 && _preferences->getBool(preference_acl_opn_fob1)) || (action == NukiOpener::LockAction::FobAction2 && _preferences->getBool(preference_acl_opn_fob2)) || (action == NukiOpener::LockAction::FobAction3 && _preferences->getBool(preference_acl_opn_fob3))) nukiOpenerPreferences = new Preferences();
nukiOpenerPreferences->begin("nukihub", true);
if((action == NukiOpener::LockAction::ActivateRTO && nukiOpenerPreferences->getBool(preferenceaclactrto)) || (action == NukiOpener::LockAction::DeactivateRTO && nukiOpenerPreferences->getBool(preferenceacldeactrto)) || (action == NukiOpener::LockAction::ElectricStrikeActuation && nukiOpenerPreferences->getBool(preferenceaclactesa)) || (action == NukiOpener::LockAction::ActivateCM && nukiOpenerPreferences->getBool(preferenceaclactcm)) || (action == NukiOpener::LockAction::DeactivateCM && nukiOpenerPreferences->getBool(preferenceacldeactcm)) || (action == NukiOpener::LockAction::FobAction1 && nukiOpenerPreferences->getBool(preferenceaclopnfob1)) || (action == NukiOpener::LockAction::FobAction2 && nukiOpenerPreferences->getBool(preferenceaclopnfob2)) || (action == NukiOpener::LockAction::FobAction3 && nukiOpenerPreferences->getBool(preferenceaclopnfob3)))
{ {
nukiOpenerPreferences->end();
return LockActionResult::Success; return LockActionResult::Success;
} }
nukiOpenerPreferences->end();
return LockActionResult::AccessDenied; return LockActionResult::AccessDenied;
} }

9
NukiOpenerWrapper.h
View File

@@ -104,14 +104,7 @@ private:
bool _nukiAdvancedConfigValid = false; bool _nukiAdvancedConfigValid = false;
bool _hassEnabled = false; bool _hassEnabled = false;
bool _hassSetupCompleted = false; bool _hassSetupCompleted = false;
bool _aclActRTO = false;
bool _aclDeactRTO = false;
bool _aclESA = false;
bool _aclActCM = false;
bool _aclDeactCM = false;
bool _aclFob1 = false;
bool _aclFob2 = false;
bool _aclFob3 = false;
bool _paired = false; bool _paired = false;
bool _statusUpdated = false; bool _statusUpdated = false;
bool _hasKeypad = false; bool _hasKeypad = false;

1
NukiWrapper.cpp
View File

@@ -7,6 +7,7 @@
#include <NukiLockUtils.h> #include <NukiLockUtils.h>
NukiWrapper* nukiInst; NukiWrapper* nukiInst;
Preferences* preferences = nullptr;
NukiWrapper::NukiWrapper(const std::string& deviceName, NukiDeviceId* deviceId, BleScanner::Scanner* scanner, NetworkLock* network, Gpio* gpio, Preferences* preferences) NukiWrapper::NukiWrapper(const std::string& deviceName, NukiDeviceId* deviceId, BleScanner::Scanner* scanner, NetworkLock* network, Gpio* gpio, Preferences* preferences)
: _deviceName(deviceName), : _deviceName(deviceName),

10
NukiWrapper.h
View File

@@ -98,15 +98,7 @@ private:
bool _nukiAdvancedConfigValid = false; bool _nukiAdvancedConfigValid = false;
bool _hassEnabled = false; bool _hassEnabled = false;
bool _hassSetupCompleted = false; bool _hassSetupCompleted = false;
bool _aclLock = false;
bool _aclUnlock = false;
bool _aclUnlatch = false;
bool _aclLockNGo = false;
bool _aclLockNGoU = false;
bool _aclFLock = false;
bool _aclFob1 = false;
bool _aclFob2 = false;
bool _aclFob3 = false;
bool _paired = false; bool _paired = false;
bool _statusUpdated = false; bool _statusUpdated = false;
bool _hasKeypad = false; bool _hasKeypad = false;