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

move watchdog reset into retry wrapper loop

Browse Source
This commit is contained in:
technyon
2025-10-06 19:09:50 +07:00
parent 0e1caf6211
commit ed02f0162f
3 changed files with 11 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/NukiOpenerWrapper.cpp
View File

@@ -302,12 +302,6 @@ void NukiOpenerWrapper::update()
if(cmdResult != Nuki::CmdResult::Success) if(cmdResult != Nuki::CmdResult::Success)
{ {
_network->publishRetry(std::to_string(retryCount + 1)); _network->publishRetry(std::to_string(retryCount + 1));
if (esp_task_wdt_status(NULL) == ESP_OK)
{
esp_task_wdt_reset();
}
++retryCount; ++retryCount;
} }
postponeBleWatchdog(); postponeBleWatchdog();
@@ -612,12 +606,7 @@ void NukiOpenerWrapper::updateBatteryState()
result = _nukiRetryHandler->retryComm([&]() result = _nukiRetryHandler->retryComm([&]()
{ {
Nuki::CmdResult cmdResult = _nukiOpener.requestBatteryReport(&_batteryReport); return _nukiOpener.requestBatteryReport(&_batteryReport);
if (esp_task_wdt_status(NULL) == ESP_OK)
{
esp_task_wdt_reset();
}
return cmdResult;
}); });
if(result == Nuki::CmdResult::Success) if(result == Nuki::CmdResult::Success)
@@ -966,12 +955,7 @@ void NukiOpenerWrapper::updateAuth(bool retrieved)
result = _nukiRetryHandler->retryComm([&]() result = _nukiRetryHandler->retryComm([&]()
{ {
Nuki::CmdResult cmdResult = _nukiOpener.retrieveAuthorizationEntries(0, _preferences->getInt(preference_auth_max_entries, MAX_AUTH)); return _nukiOpener.retrieveAuthorizationEntries(0, _preferences->getInt(preference_auth_max_entries, MAX_AUTH));
if (esp_task_wdt_status(NULL) == ESP_OK)
{
esp_task_wdt_reset();
}
return cmdResult;
}); });
if(result == Nuki::CmdResult::Success) if(result == Nuki::CmdResult::Success)

36
src/NukiWrapper.cpp
View File

@@ -324,12 +324,6 @@ void NukiWrapper::update(bool reboot)
if(cmdResult != Nuki::CmdResult::Success) if(cmdResult != Nuki::CmdResult::Success)
{ {
_network->publishRetry(std::to_string(retryCount + 1)); _network->publishRetry(std::to_string(retryCount + 1));
if (esp_task_wdt_status(NULL) == ESP_OK)
{
esp_task_wdt_reset();
}
++retryCount; ++retryCount;
} }
postponeBleWatchdog(); postponeBleWatchdog();
@@ -1134,12 +1128,7 @@ void NukiWrapper::updateAuth(bool retrieved)
result = _nukiRetryHandler->retryComm([&]() result = _nukiRetryHandler->retryComm([&]()
{ {
Nuki::CmdResult cmdResult = _nukiLock.retrieveAuthorizationEntries(0, _preferences->getInt(preference_auth_max_entries, MAX_AUTH)); return _nukiLock.retrieveAuthorizationEntries(0, _preferences->getInt(preference_auth_max_entries, MAX_AUTH));
if (esp_task_wdt_status(NULL) == ESP_OK)
{
esp_task_wdt_reset();
}
return cmdResult;
}); });
NukiHelper::printCommandResult(result); NukiHelper::printCommandResult(result);
@@ -4010,18 +3999,9 @@ void NukiWrapper::readConfig()
result = _nukiRetryHandler->retryComm([&]() result = _nukiRetryHandler->retryComm([&]()
{ {
Nuki::CmdResult cmdResult = _nukiLock.requestConfig(&_nukiConfig); return _nukiLock.requestConfig(&_nukiConfig);
if(result != Nuki::CmdResult::Success)
{
if (esp_task_wdt_status(NULL) == ESP_OK)
{
esp_task_wdt_reset();
}
}
return cmdResult;
}); });
_nukiConfigValid = result == Nuki::CmdResult::Success; _nukiConfigValid = result == Nuki::CmdResult::Success;
} }
@@ -4032,15 +4012,7 @@ void NukiWrapper::readAdvancedConfig()
result = _nukiRetryHandler->retryComm([&]() result = _nukiRetryHandler->retryComm([&]()
{ {
Nuki::CmdResult cmdResult = _nukiLock.requestAdvancedConfig(&_nukiAdvancedConfig); return _nukiLock.requestAdvancedConfig(&_nukiAdvancedConfig);
if(result != Nuki::CmdResult::Success)
{
if (esp_task_wdt_status(NULL) == ESP_OK)
{
esp_task_wdt_reset();
}
}
return cmdResult;
}); });
_nukiAdvancedConfigValid = result == Nuki::CmdResult::Success; _nukiAdvancedConfigValid = result == Nuki::CmdResult::Success;
} }

5
src/util/NukiRetryHandler.cpp
View File

@@ -21,6 +21,11 @@ const Nuki::CmdResult NukiRetryHandler::retryComm(std::function<Nuki::CmdResult(
while(retryCount < _nrOfRetries + 1 && cmdResult != Nuki::CmdResult::Success) while(retryCount < _nrOfRetries + 1 && cmdResult != Nuki::CmdResult::Success)
{ {
if (esp_task_wdt_status(NULL) == ESP_OK)
{
esp_task_wdt_reset();
}
cmdResult = func(); cmdResult = func();
if (cmdResult != Nuki::CmdResult::Success) if (cmdResult != Nuki::CmdResult::Success)