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

Merge branch 'technyon:master' into fix-continuous-mode-ring-detection

Browse Source
This commit is contained in:
iranl
2024-03-10 20:34:42 +01:00
committed by GitHub
parent 4ba0501244 1d9787374c
commit 1029ecb288
5 changed files with 571 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
Network.cpp
View File

@@ -67,13 +67,13 @@ void Network::setupDevice()
{
if(_preferences->getBool(preference_network_wifi_fallback_disabled))
{
Log->println(F("Failed to connect to network. Wifi fallback is disable, rebooting."));
Log->println(F("Failed to connect to network. Wi-Fi fallback is disabled, rebooting."));
memset(WiFi_fallbackDetect, 0, sizeof(WiFi_fallbackDetect));
sleep(5);
restartEsp(RestartReason::NetworkDeviceCriticalFailureNoWifiFallback);
}
Log->println(F("Switching to WiFi device as fallback."));
Log->println(F("Switching to Wi-Fi device as fallback."));
_networkDeviceType = NetworkDeviceType::WiFi;
}
else
@@ -82,7 +82,7 @@ void Network::setupDevice()
switch (hardwareDetect)
{
case 1:
Log->println(F("Wifi only"));
Log->println(F("Wi-Fi only"));
_networkDeviceType = NetworkDeviceType::WiFi;
break;
case 2:
@@ -110,7 +110,7 @@ void Network::setupDevice()
_networkDeviceType = NetworkDeviceType::LilyGO_T_ETH_POE;
break;
default:
Log->println(F("Unknown hardware selected, falling back to Wifi."));
Log->println(F("Unknown hardware selected, falling back to Wi-Fi."));
_networkDeviceType = NetworkDeviceType::WiFi;
break;
}
@@ -286,7 +286,7 @@ bool Network::update()
{
case ReconnectStatus::CriticalFailure:
strcpy(WiFi_fallbackDetect, "wifi_fallback");
Log->println("Network device has a critical failure, enable fallback to Wifi and reboot.");
Log->println("Network device has a critical failure, enable fallback to Wi-Fi and reboot.");
delay(200);
restartEsp(RestartReason::NetworkDeviceCriticalFailure);
break;
@@ -369,19 +369,19 @@ bool Network::update()
int httpResponseCode = https.GET();
if (httpResponseCode == HTTP_CODE_OK || httpResponseCode == HTTP_CODE_MOVED_PERMANENTLY)
if (httpResponseCode == HTTP_CODE_OK || httpResponseCode == HTTP_CODE_MOVED_PERMANENTLY)
{
DynamicJsonDocument doc(6144);
DeserializationError jsonError = deserializeJson(doc, https.getStream());
if (!jsonError)
if (!jsonError)
{
_latestVersion = doc["tag_name"];
publishString(_maintenancePathPrefix, mqtt_topic_info_nuki_hub_latest, _latestVersion);
if (_latestVersion != _preferences->getString(preference_latest_version).c_str())
if (_latestVersion != _preferences->getString(preference_latest_version).c_str())
{
_preferences->putString(preference_latest_version, _latestVersion);
_preferences->putString(preference_latest_version, _latestVersion);
}
}
}
@@ -1061,7 +1061,7 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
"unlatch",
uidString,
"_unlatch_button",
"Unlatch",
"Open",
name,
baseTopic,
"",
@@ -1071,7 +1071,82 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
"",
String("~") + mqtt_topic_lock_action,
{ { "enabled_by_default", "false" },
{ "pl_prs", "unlatch" }});
{ "pl_prs", openAction }});
// Query Lock State
publishHassTopic("button",
"query_lockstate",
uidString,
"_query_lockstate_button",
"Query lock state",
name,
baseTopic,
"",
deviceType,
"",
"",
"diagnostic",
String("~") + mqtt_topic_query_lockstate,
{ { "enabled_by_default", "false" },
{ "pl_prs", "1" }});
// Query Config
publishHassTopic("button",
"query_config",
uidString,
"_query_config_button",
"Query config",
name,
baseTopic,
"",
deviceType,
"",
"",
"diagnostic",
String("~") + mqtt_topic_query_config,
{ { "enabled_by_default", "false" },
{ "pl_prs", "1" }});
if(hasKeypad)
{
// Query Battery
publishHassTopic("button",
"query_keypad",
uidString,
"_query_keypad_button",
"Query keypad",
name,
baseTopic,
"",
deviceType,
"",
"",
"diagnostic",
String("~") + mqtt_topic_query_keypad,
{ { "enabled_by_default", "false" },
{ "pl_prs", "1" }});
}
else
{
removeHassTopic("button", "query_keypad", uidString);
}
// Query Lock State Command result
publishHassTopic("button",
"query_commandresult",
uidString,
"_query_commandresult_button",
"Query lock state command result",
name,
baseTopic,
"",
deviceType,
"",
"",
"diagnostic",
String("~") + mqtt_topic_query_lockstate_command_result,
{ { "enabled_by_default", "false" },
{ "pl_prs", "1" }});
}
}
@@ -1112,6 +1187,83 @@ void Network::publishHASSConfigAdditionalButtons(char *deviceType, const char *b
String("~") + mqtt_topic_lock_action,
{ { "enabled_by_default", "false" },
{ "pl_prs", "lockNgoUnlatch" }});
// Query Battery
publishHassTopic("button",
"query_battery",
uidString,
"_query_battery_button",
"Query battery",
name,
baseTopic,
"",
deviceType,
"",
"",
"diagnostic",
String("~") + mqtt_topic_query_battery,
{ { "enabled_by_default", "false" },
{ "pl_prs", "1" }});
// Auto Lock
publishHassTopic("switch",
"auto_lock",
uidString,
"_auto_lock",
"Auto lock",
name,
baseTopic,
String("~") + mqtt_topic_config_auto_lock,
deviceType,
"",
"",
"config",
String("~") + mqtt_topic_config_auto_lock,
{ { "enabled_by_default", "false" },
{ "pl_on", "1" },
{ "pl_off", "0" },
{ "state_on", "1" },
{ "state_off", "0" }});
// Auto Unlock
publishHassTopic("switch",
"auto_unlock",
uidString,
"_auto_unlock",
"Auto unlock",
name,
baseTopic,
String("~") + mqtt_topic_config_auto_unlock,
deviceType,
"",
"",
"config",
String("~") + mqtt_topic_config_auto_unlock,
{ { "enabled_by_default", "false" },
{ "pl_on", "1" },
{ "pl_off", "0" },
{ "state_on", "1" },
{ "state_off", "0" }});
// Double lock
publishHassTopic("switch",
"double_lock",
uidString,
"_double_lock",
"Double lock",
name,
baseTopic,
String("~") + mqtt_topic_config_single_lock,
deviceType,
"",
"",
"config",
String("~") + mqtt_topic_config_single_lock,
{ { "enabled_by_default", "false" },
{ "pl_on", "0" },
{ "pl_off", "1" },
{ "state_on", "0" },
{ "state_off", "1" }});
}
void Network::publishHASSConfigBatLevel(char *deviceType, const char *baseTopic, char *name, char *uidString)
@@ -1168,7 +1320,7 @@ void Network::publishHASSConfigContinuousMode(char *deviceType, const char *base
if (discoveryTopic != "")
{
publishHassTopic("binary_sensor",
"continuous_mode",
uidString,
@@ -1184,7 +1336,7 @@ void Network::publishHASSConfigContinuousMode(char *deviceType, const char *base
"",
{{"pl_on", "on"},
{"pl_off", "off"}});
publishHassTopic("switch",
"continuous_mode",
uidString,
@@ -1461,6 +1613,14 @@ void Network::removeHASSConfig(char* uidString)
removeHassTopic("sensor", "bluetooth_signal_strength", uidString);
removeHassTopic("binary_sensor", "continuous_mode", uidString);
removeHassTopic("switch", "continuous_mode", uidString);
removeHassTopic("button", "query_lockstate", uidString);
removeHassTopic("button", "query_config", uidString);
removeHassTopic("button", "query_keypad", uidString);
removeHassTopic("button", "query_battery", uidString);
removeHassTopic("button", "query_commandresult", uidString);
removeHassTopic("switch", "auto_lock", uidString);
removeHassTopic("switch", "auto_unlock", uidString);
removeHassTopic("switch", "double_lock", uidString);
}
}