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

restore authId and authName nodes

Browse Source
This commit is contained in:
technyon
2022-08-15 22:49:35 +02:00
parent 7a3c2c0142
commit e8f7c87579
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
NetworkLock.cpp
View File

@@ -235,10 +235,22 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
{ {
char str[50]; char str[50];
bool authFound = false;
uint32_t authId = 0;
char authName[33];
memset(authName, 0, sizeof(authName));
String json = "[\n"; String json = "[\n";
for(const auto& log : logEntries) for(const auto& log : logEntries)
{ {
if((log.loggingType == NukiLock::LoggingType::LockAction || log.loggingType == NukiLock::LoggingType::KeypadAction) && ! authFound)
{
authFound = true;
authId = log.authId;
memcpy(authName, log.name, sizeof(log.name));
}
json.concat("{\n"); json.concat("{\n");
json.concat("\"index\": "); json.concat(log.index); json.concat(",\n"); json.concat("\"index\": "); json.concat(log.index); json.concat(",\n");
@@ -323,12 +335,19 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
json.concat("]"); json.concat("]");
publishString(mqtt_topic_lock_log, json.c_str()); publishString(mqtt_topic_lock_log, json.c_str());
if(authFound)
{
publishUInt(mqtt_topic_lock_auth_id, authId);
publishString(mqtt_topic_lock_auth_name, authName);
}
} }
void NetworkLock::clearAuthorizationInfo() void NetworkLock::clearAuthorizationInfo()
{ {
publishString(mqtt_topic_lock_log, ""); publishString(mqtt_topic_lock_log, "");
} publishUInt(mqtt_topic_lock_auth_id, 0);
publishString(mqtt_topic_lock_auth_name, "--");}
void NetworkLock::publishCommandResult(const char *resultStr) void NetworkLock::publishCommandResult(const char *resultStr)
{ {

18
NetworkOpener.cpp
View File

@@ -146,10 +146,22 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
{ {
char str[50]; char str[50];
bool authFound = false;
uint32_t authId = 0;
char authName[33];
memset(authName, 0, sizeof(authName));
String json = "[\n"; String json = "[\n";
for(const auto& log : logEntries) for(const auto& log : logEntries)
{ {
if((log.loggingType == NukiOpener::LoggingType::LockAction || log.loggingType == NukiOpener::LoggingType::KeypadAction || log.loggingType == NukiOpener::LoggingType::DoorbellRecognition) && ! authFound)
{
authFound = true;
authId = log.authId;
memcpy(authName, log.name, sizeof(log.name));
}
json.concat("{\n"); json.concat("{\n");
json.concat("\"index\": "); json.concat(log.index); json.concat(",\n"); json.concat("\"index\": "); json.concat(log.index); json.concat(",\n");
@@ -263,6 +275,12 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
json.concat("]"); json.concat("]");
publishString(mqtt_topic_lock_log, json.c_str()); publishString(mqtt_topic_lock_log, json.c_str());
if(authFound)
{
publishUInt(mqtt_topic_lock_auth_id, authId);
publishString(mqtt_topic_lock_auth_name, authName);
}
} }
void NetworkOpener::logactionCompletionStatusToString(uint8_t value, char* out) void NetworkOpener::logactionCompletionStatusToString(uint8_t value, char* out)