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

Merge branch 'master' of https://github.com/iranl/nuki_hub

Browse Source
This commit is contained in:
iranl
2024-05-15 20:44:17 +02:00
parent 3933f34ba1 d879596035
commit 7458d43432
3 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/NukiOpenerWrapper.cpp
View File

@@ -469,7 +469,7 @@ void NukiOpenerWrapper::updateConfig()
void NukiOpenerWrapper::updateAuthData() void NukiOpenerWrapper::updateAuthData()
{ {
if(_nukiOpener.getSecurityPincode() == 0) return; if(!isPinSet()) return;
Nuki::CmdResult result = _nukiOpener.retrieveLogEntries(0, 0, 0, true); Nuki::CmdResult result = _nukiOpener.retrieveLogEntries(0, 0, 0, true);
if(result != Nuki::CmdResult::Success) if(result != Nuki::CmdResult::Success)
@@ -767,10 +767,19 @@ Nuki::BatteryType NukiOpenerWrapper::batteryTypeToEnum(const char* str)
void NukiOpenerWrapper::onConfigUpdateReceived(const char *value) void NukiOpenerWrapper::onConfigUpdateReceived(const char *value)
{ {
JsonDocument jsonResult; JsonDocument jsonResult;
char _resbuf[2048]; char _resbuf[2048];
if(_nukiOpener.getSecurityPincode() == 0) if(!_configRead || !_nukiConfigValid)
{
jsonResult["general"] = "configNotReady";
serializeJson(jsonResult, _resbuf, sizeof(_resbuf));
_network->publishConfigCommandResult(_resbuf);
return;
}
if(!isPinSet())
{ {
jsonResult["general"] = "noPinSet"; jsonResult["general"] = "noPinSet";
serializeJson(jsonResult, _resbuf, sizeof(_resbuf)); serializeJson(jsonResult, _resbuf, sizeof(_resbuf));
@@ -1402,7 +1411,7 @@ void NukiOpenerWrapper::onKeypadCommandReceived(const char *command, const uint
void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value) void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value)
{ {
if(_nukiOpener.getSecurityPincode() == 0) if(!isPinSet())
{ {
_network->publishKeypadJsonCommandResult("noPinSet"); _network->publishKeypadJsonCommandResult("noPinSet");
return; return;
@@ -1744,7 +1753,13 @@ void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value)
void NukiOpenerWrapper::onTimeControlCommandReceived(const char *value) void NukiOpenerWrapper::onTimeControlCommandReceived(const char *value)
{ {
if(_nukiOpener.getSecurityPincode() == 0) if(!_configRead || !_nukiConfigValid)
{
_network->publishTimeControlCommandResult("configNotReady");
return;
}
if(!isPinSet())
{ {
_network->publishTimeControlCommandResult("noPinSet"); _network->publishTimeControlCommandResult("noPinSet");
return; return;

22
src/NukiWrapper.cpp
View File

@@ -450,7 +450,7 @@ void NukiWrapper::updateConfig()
void NukiWrapper::updateAuthData() void NukiWrapper::updateAuthData()
{ {
if(_nukiLock.getSecurityPincode() == 0) return; if(!isPinSet()) return;
Nuki::CmdResult result = _nukiLock.retrieveLogEntries(0, 0, 0, true); Nuki::CmdResult result = _nukiLock.retrieveLogEntries(0, 0, 0, true);
if(result != Nuki::CmdResult::Success) if(result != Nuki::CmdResult::Success)
@@ -707,7 +707,15 @@ void NukiWrapper::onConfigUpdateReceived(const char *value)
JsonDocument jsonResult; JsonDocument jsonResult;
char _resbuf[2048]; char _resbuf[2048];
if(_nukiLock.getSecurityPincode() == 0) if(!_configRead || !_nukiConfigValid)
{
jsonResult["general"] = "configNotReady";
serializeJson(jsonResult, _resbuf, sizeof(_resbuf));
_network->publishConfigCommandResult(_resbuf);
return;
}
if(!isPinSet())
{ {
jsonResult["general"] = "noPinSet"; jsonResult["general"] = "noPinSet";
serializeJson(jsonResult, _resbuf, sizeof(_resbuf)); serializeJson(jsonResult, _resbuf, sizeof(_resbuf));
@@ -1389,7 +1397,7 @@ void NukiWrapper::onKeypadCommandReceived(const char *command, const uint &id, c
void NukiWrapper::onKeypadJsonCommandReceived(const char *value) void NukiWrapper::onKeypadJsonCommandReceived(const char *value)
{ {
if(_nukiLock.getSecurityPincode() == 0) if(!isPinSet())
{ {
_network->publishKeypadJsonCommandResult("noPinSet"); _network->publishKeypadJsonCommandResult("noPinSet");
return; return;
@@ -1731,7 +1739,13 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value)
void NukiWrapper::onTimeControlCommandReceived(const char *value) void NukiWrapper::onTimeControlCommandReceived(const char *value)
{ {
if(_nukiLock.getSecurityPincode() == 0) if(!_configRead || !_nukiConfigValid)
{
_network->publishTimeControlCommandResult("configNotReady");
return;
}
if(!isPinSet())
{ {
_network->publishTimeControlCommandResult("noPinSet"); _network->publishTimeControlCommandResult("noPinSet");
return; return;

6
src/main.cpp
View File

@@ -112,9 +112,9 @@ void setupTasks()
{ {
// configMAX_PRIORITIES is 25 // configMAX_PRIORITIES is 25
xTaskCreatePinnedToCore(networkTask, "ntw", 10240, NULL, 3, &networkTaskHandle, 1); xTaskCreatePinnedToCore(networkTask, "ntw", 12288, NULL, 3, &networkTaskHandle, 1);
xTaskCreatePinnedToCore(nukiTask, "nuki", 5120, NULL, 2, &nukiTaskHandle, 1); xTaskCreatePinnedToCore(nukiTask, "nuki", 8192, NULL, 2, &nukiTaskHandle, 1);
xTaskCreatePinnedToCore(presenceDetectionTask, "prdet", 896, NULL, 5, &presenceDetectionTaskHandle, 1); xTaskCreatePinnedToCore(presenceDetectionTask, "prdet", 1024, NULL, 5, &presenceDetectionTaskHandle, 1);
} }
void initEthServer(const NetworkDeviceType device) void initEthServer(const NetworkDeviceType device)