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

Merge branch 'master' of github.com:technyon/nuki_hub

Browse Source
This commit is contained in:
technyon
2024-01-30 14:26:58 +01:00
parent 6c6174fdb2 f64d383918
commit bcdcc8aed9
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AccessLevel.h
View File

@@ -4,5 +4,6 @@ enum class AccessLevel
{ {
Full = 0, Full = 0,
LockOnly = 1, LockOnly = 1,
ReadOnly = 2 ReadOnly = 2,
LockAndUnlock = 3
}; };

8
NukiOpenerWrapper.cpp
View File

@@ -486,6 +486,14 @@ LockActionResult NukiOpenerWrapper::onLockActionReceivedCallback(const char *val
nukiOpenerInst->_nextLockAction = action; nukiOpenerInst->_nextLockAction = action;
return LockActionResult::Success; return LockActionResult::Success;
break; break;
case AccessLevel::LockAndUnlock:
if(action == NukiOpener::LockAction::ActivateRTO || action == NukiOpener::LockAction::ActivateCM || action == NukiOpener::LockAction::DeactivateRTO || action == NukiOpener::LockAction::DeactivateCM)
{
nukiOpenerInst->_nextLockAction = action;
return LockActionResult::Success;
}
return LockActionResult::AccessDenied;
break;
case AccessLevel::LockOnly: case AccessLevel::LockOnly:
if(action == NukiOpener::LockAction::DeactivateRTO || action == NukiOpener::LockAction::DeactivateCM) if(action == NukiOpener::LockAction::DeactivateRTO || action == NukiOpener::LockAction::DeactivateCM)
{ {

8
NukiWrapper.cpp
View File

@@ -455,6 +455,14 @@ LockActionResult NukiWrapper::onLockActionReceivedCallback(const char *value)
nukiInst->_nextLockAction = action; nukiInst->_nextLockAction = action;
return LockActionResult::Success; return LockActionResult::Success;
break; break;
case AccessLevel::LockAndUnlock:
if(action == NukiLock::LockAction::Lock || action == NukiLock::LockAction::Unlock || action == NukiLock::LockAction::LockNgo || action == NukiLock::LockAction::FullLock)
{
nukiInst->_nextLockAction = action;
return LockActionResult::Success;
}
return LockActionResult::AccessDenied;
break;
case AccessLevel::LockOnly: case AccessLevel::LockOnly:
if(action == NukiLock::LockAction::Lock) if(action == NukiLock::LockAction::Lock)
{ {

1
WebCfgServer.cpp
View File

@@ -1314,6 +1314,7 @@ const std::vector<std::pair<String, String>> WebCfgServer::getAccessLevelOptions
std::vector<std::pair<String, String>> options; std::vector<std::pair<String, String>> options;
options.push_back(std::make_pair(std::to_string((int)AccessLevel::Full).c_str(), "Full")); options.push_back(std::make_pair(std::to_string((int)AccessLevel::Full).c_str(), "Full"));
options.push_back(std::make_pair(std::to_string((int)AccessLevel::LockAndUnlock).c_str(), "Lock and unlock operation only"));
options.push_back(std::make_pair(std::to_string((int)AccessLevel::LockOnly).c_str(), "Lock operation only")); options.push_back(std::make_pair(std::to_string((int)AccessLevel::LockOnly).c_str(), "Lock operation only"));
options.push_back(std::make_pair(std::to_string((int)AccessLevel::ReadOnly).c_str(), "Read only")); options.push_back(std::make_pair(std::to_string((int)AccessLevel::ReadOnly).c_str(), "Read only"));