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

Hybrid mode fixes (#461)

Browse Source
This commit is contained in:
iranl
2024-08-23 12:22:26 +02:00
committed by GitHub
parent 22348d71a3
commit 11d11951b3
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/NukiWrapper.cpp
View File

@@ -960,9 +960,16 @@ LockActionResult NukiWrapper::onLockActionReceivedCallback(const char *value)
if(!networkInst->_offConnected) nukiInst->_nextLockAction = action;
else
{
networkInst->_offCommandExecutedTs = (esp_timer_get_time() / 1000) + 2000;
networkInst->_offCommand = action;
networkInst->publishOffAction((int)action);
if(nukiLockPreferences->getBool(preference_official_hybrid_actions, false))
{
networkInst->_offCommandExecutedTs = (esp_timer_get_time() / 1000) + 2000;
networkInst->_offCommand = action;
networkInst->publishOffAction((int)action);
}
else
{
nukiInst->_nextLockAction = action;
}
}
nukiLockPreferences->end();
return LockActionResult::Success;

4
src/WebCfgServer.cpp
View File

@@ -2748,7 +2748,7 @@ void WebCfgServer::buildMqttConfigHtml(AsyncWebServerRequest *request)
printCheckBox("OFFHYBRID", "Enable hybrid official MQTT and Nuki Hub setup", _preferences->getBool(preference_official_hybrid), "");
printCheckBox("HYBRIDACT", "Enable sending actions through official MQTT", _preferences->getBool(preference_official_hybrid_actions), "");
printInputField("HYBRIDTIMER", "Time between status updates when official MQTT is offline (seconds)", _preferences->getInt(preference_query_interval_hybrid_lockstate), 5, "");
printCheckBox("HYBRIDRETRY", "Retry command sent using official MQTT over BLE if failed", _preferences->getBool(preference_official_hybrid_retry), "");
// printCheckBox("HYBRIDRETRY", "Retry command sent using official MQTT over BLE if failed", _preferences->getBool(preference_official_hybrid_retry), ""); // NOT IMPLEMENTED (YET?)
_response.concat("</table>");
_response.concat("* If no encryption is configured for the MQTT broker, leave empty.<br><br>");
@@ -3419,11 +3419,13 @@ void WebCfgServer::buildInfoHtml(AsyncWebServerRequest *request)
_response.concat(_nuki->offConnected() ? "Yes": "No");
_response.concat("\nSending actions through official MQTT enabled: ");
_response.concat(_preferences->getBool(preference_official_hybrid_actions, false) ? "Yes" : "No");
/* NOT IMPLEMENTED (YET?)
if(_preferences->getBool(preference_official_hybrid_actions, false))
{
_response.concat("\nRetry actions through BLE enabled: ");
_response.concat(_preferences->getBool(preference_official_hybrid_retry, false) ? "Yes" : "No");
}
*/
_response.concat("\nTime between status updates when official MQTT is offline (s): ");
_response.concat(_preferences->getInt(preference_query_interval_hybrid_lockstate, 600));
}