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

only publish config and battery state if successfully queried

Browse Source
This commit is contained in:
technyon
2023-02-10 16:43:08 +01:00
parent ac629b4e35
commit 8e16b3e7b2
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
NukiOpenerWrapper.cpp
View File

@@ -304,8 +304,11 @@ void NukiOpenerWrapper::updateKeyTurnerState()
void NukiOpenerWrapper::updateBatteryState() void NukiOpenerWrapper::updateBatteryState()
{ {
_nukiOpener.requestBatteryReport(&_batteryReport); Nuki::CmdResult result = _nukiOpener.requestBatteryReport(&_batteryReport);
if(result == Nuki::CmdResult::Success)
{
_network->publishBatteryReport(_batteryReport); _network->publishBatteryReport(_batteryReport);
}
postponeBleWatchdog(); postponeBleWatchdog();
} }
@@ -315,9 +318,15 @@ void NukiOpenerWrapper::updateConfig()
readAdvancedConfig(); readAdvancedConfig();
_configRead = true; _configRead = true;
_hasKeypad = _nukiConfig.hasKeypad > 0; _hasKeypad = _nukiConfig.hasKeypad > 0;
if(_nukiConfigValid)
{
_network->publishConfig(_nukiConfig); _network->publishConfig(_nukiConfig);
}
if(_nukiAdvancedConfigValid)
{
_network->publishAdvancedConfig(_nukiAdvancedConfig); _network->publishAdvancedConfig(_nukiAdvancedConfig);
} }
}
void NukiOpenerWrapper::updateAuthData() void NukiOpenerWrapper::updateAuthData()
{ {

11
NukiWrapper.cpp
View File

@@ -304,8 +304,11 @@ void NukiWrapper::updateKeyTurnerState()
void NukiWrapper::updateBatteryState() void NukiWrapper::updateBatteryState()
{ {
_nukiLock.requestBatteryReport(&_batteryReport); Nuki::CmdResult result = _nukiLock.requestBatteryReport(&_batteryReport);
if(result == Nuki::CmdResult::Success)
{
_network->publishBatteryReport(_batteryReport); _network->publishBatteryReport(_batteryReport);
}
postponeBleWatchdog(); postponeBleWatchdog();
} }
@@ -315,9 +318,15 @@ void NukiWrapper::updateConfig()
readAdvancedConfig(); readAdvancedConfig();
_configRead = true; _configRead = true;
_hasKeypad = _nukiConfig.hasKeypad > 0; _hasKeypad = _nukiConfig.hasKeypad > 0;
if(_nukiConfigValid)
{
_network->publishConfig(_nukiConfig); _network->publishConfig(_nukiConfig);
}
if(_nukiAdvancedConfigValid)
{
_network->publishAdvancedConfig(_nukiAdvancedConfig); _network->publishAdvancedConfig(_nukiAdvancedConfig);
} }
}
void NukiWrapper::updateAuthData() void NukiWrapper::updateAuthData()
{ {