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:30:42 +01:00
parent 5d545e5704
commit b0eaf942f4
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NukiOpenerWrapper.cpp
View File

@@ -494,7 +494,7 @@ LockActionResult NukiOpenerWrapper::onLockActionReceivedCallback(const char *val
nukiOpenerPreferences = new Preferences(); nukiOpenerPreferences = new Preferences();
nukiOpenerPreferences->begin("nukihub", true); 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))) if((action == NukiOpener::LockAction::ActivateRTO && nukiOpenerPreferences->getBool(preference_acl_act_rto)) || (action == NukiOpener::LockAction::DeactivateRTO && nukiOpenerPreferences->getBool(preference_acl_deact_rto)) || (action == NukiOpener::LockAction::ElectricStrikeActuation && nukiOpenerPreferences->getBool(preference_acl_act_esa)) || (action == NukiOpener::LockAction::ActivateCM && nukiOpenerPreferences->getBool(preference_acl_act_cm)) || (action == NukiOpener::LockAction::DeactivateCM && nukiOpenerPreferences->getBool(preference_acl_deact_cm)) || (action == NukiOpener::LockAction::FobAction1 && nukiOpenerPreferences->getBool(preference_acl_opn_fob1)) || (action == NukiOpener::LockAction::FobAction2 && nukiOpenerPreferences->getBool(preference_acl_opn_fob2)) || (action == NukiOpener::LockAction::FobAction3 && nukiOpenerPreferences->getBool(preference_acl_opn_fob3)))
{ {
nukiOpenerPreferences->end(); nukiOpenerPreferences->end();
return LockActionResult::Success; return LockActionResult::Success;

9
NukiWrapper.cpp
View File

@@ -7,7 +7,7 @@
#include <NukiLockUtils.h> #include <NukiLockUtils.h>
NukiWrapper* nukiInst; NukiWrapper* nukiInst;
Preferences* preferences = nullptr; Preferences* nukiLockPreferences = 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),
@@ -481,11 +481,16 @@ LockActionResult NukiWrapper::onLockActionReceivedCallback(const char *value)
return LockActionResult::UnknownAction; return LockActionResult::UnknownAction;
} }
if((action == NukiLock::LockAction::Lock && _aclLock) || (action == NukiLock::LockAction::Unlock && _aclUnlock) || (action == NukiLock::LockAction::Unlatch && _aclUnlatch) || (action == NukiLock::LockAction::LockNgo && _aclLockNGo) || (action == NukiLock::LockAction::LockNgoUnlatch && _aclLockNGoU) || (action == NukiLock::LockAction::FullLock && _aclFLock) || (action == NukiLock::LockAction::FobAction1 && _aclFob1) || (action == NukiLock::LockAction::FobAction2 && _aclFob2) || (action == NukiLock::LockAction::FobAction3 && _aclFob3)) nukiLockPreferences = new Preferences();
nukiLockPreferences->begin("nukihub", true);
if((action == NukiLock::LockAction::Lock && nukiLockPreferences->getBool(preference_acl_lock)) || (action == NukiLock::LockAction::Unlock && nukiLockPreferences->getBool(preference_acl_unlock)) || (action == NukiLock::LockAction::Unlatch && nukiLockPreferences->getBool(preference_acl_unlatch)) || (action == NukiLock::LockAction::LockNgo && nukiLockPreferences->getBool(preference_acl_lockngo)) || (action == NukiLock::LockAction::LockNgoUnlatch && nukiLockPreferences->getBool(preference_acl_lockngo_unlatch)) || (action == NukiLock::LockAction::FullLock && nukiLockPreferences->getBool(preference_acl_fulllock)) || (action == NukiLock::LockAction::FobAction1 && nukiLockPreferences->getBool(preference_acl_lck_fob1)) || (action == NukiLock::LockAction::FobAction2 && nukiLockPreferences->getBool(preference_acl_lck_fob2)) || (action == NukiLock::LockAction::FobAction3 && nukiLockPreferences->getBool(preference_acl_lck_fob3)))
{ {
nukiLockPreferences->end();
return LockActionResult::Success; return LockActionResult::Success;
} }
nukiLockPreferences->end();
return LockActionResult::AccessDenied; return LockActionResult::AccessDenied;
} }