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

publish source specific data in log

Browse Source
This commit is contained in:
technyon
2022-08-13 19:42:45 +02:00
parent acb09530de
commit 8aa856d615
2 changed files with 62 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
NetworkLock.cpp
View File

@@ -241,47 +241,76 @@ void NetworkLock::publishAuthorizationInfo(const std::list<Nuki::LogEntry>& logE
{ {
json.concat("{\n"); json.concat("{\n");
json.concat("\"index\": "); json.concat("\"index\": "); json.concat(log.index); json.concat(",\n");
json.concat(log.index); json.concat("\"authorizationId\": "); json.concat(log.authId); json.concat(",\n");
json.concat(",\n");
json.concat("\"authorizationId\": ");
json.concat(log.authId);
json.concat(",\n");
memset(str, 0, sizeof(str)); memset(str, 0, sizeof(str));
memcpy(str, log.name, sizeof(log.name)); memcpy(str, log.name, sizeof(log.name));
json.concat("\"authorizationName\": \""); json.concat("\"authorizationName\": \""); json.concat(str); json.concat("\",\n");
json.concat(str);
json.concat("\",\n");
json.concat("\"timeYear\": ");
json.concat(log.timeStampYear);
json.concat(",\n");
json.concat("\"timeMonth\": ");
json.concat(log.timeStampMonth);
json.concat(",\n");
json.concat("\"timeDay\": ");
json.concat(log.timeStampDay);
json.concat(",\n");
json.concat("\"timeHour\": ");
json.concat(log.timeStampHour);
json.concat(",\n");
json.concat("\"timeMinute\": ");
json.concat(log.timeStampMinute);
json.concat(",\n");
json.concat("\"timeSecond\": ");
json.concat(log.timeStampSecond);
json.concat(",\n");
json.concat("\"timeYear\": "); json.concat(log.timeStampYear); json.concat(",\n");
json.concat("\"timeMonth\": "); json.concat(log.timeStampMonth); json.concat(",\n");
json.concat("\"timeDay\": "); json.concat(log.timeStampDay); json.concat(",\n");
json.concat("\"timeHour\": "); json.concat(log.timeStampHour); json.concat(",\n");
json.concat("\"timeMinute\": "); json.concat(log.timeStampMinute); json.concat(",\n");
json.concat("\"timeSecond\": "); json.concat(log.timeStampSecond); json.concat(",\n");
memset(str, 0, sizeof(str)); memset(str, 0, sizeof(str));
loggingTypeToString(log.loggingType, str); loggingTypeToString(log.loggingType, str);
json.concat("\"type\": \""); json.concat("\"type\": \""); json.concat(str); json.concat("\",\n");
json.concat(str);
json.concat("\"\n"); switch(log.loggingType)
{
case Nuki::LoggingType::LockAction:
memset(str, 0, sizeof(str));
NukiLock::lockactionToString((NukiLock::LockAction)log.data[0], str);
json.concat("\"action\": \""); json.concat(str); json.concat("\",\n");
memset(str, 0, sizeof(str));
NukiLock::triggerToString((NukiLock::Trigger)log.data[1], str);
json.concat("\"trigger\": \""); json.concat(str); json.concat("\",\n");
memset(str, 0, sizeof(str));
NukiLock::completionStatusToString((NukiLock::CompletionStatus)log.data[3], str);
json.concat("\"completionStatus\": \""); json.concat(str); json.concat("\"\n");
break;
case Nuki::LoggingType::KeypadAction:
memset(str, 0, sizeof(str));
NukiLock::lockactionToString((NukiLock::LockAction)log.data[0], str);
json.concat("\"action\": \""); json.concat(str); json.concat("\",\n");
memset(str, 0, sizeof(str));
NukiLock::completionStatusToString((NukiLock::CompletionStatus)log.data[2], str);
json.concat("\"completionStatus\": \""); json.concat(str); json.concat("\"\n");
break;
case Nuki::LoggingType::DoorSensor:
memset(str, 0, sizeof(str));
NukiLock::lockactionToString((NukiLock::LockAction)log.data[0], str);
json.concat("\"action\": \"");
switch(log.data[0])
{
case 0:
json.concat("DoorOpened");
break;
case 1:
json.concat("DoorClosed");
break;
case 2:
json.concat("SensorJammed");
break;
default:
json.concat("Unknown");
break;
}
json.concat("\",\n");
memset(str, 0, sizeof(str));
NukiLock::completionStatusToString((NukiLock::CompletionStatus)log.data[2], str);
json.concat("\"completionStatus\": \""); json.concat(str); json.concat("\"\n");
break;
}
json.concat("}"); json.concat("}");
if(&log == &logEntries.back()) if(&log == &logEntries.back())
{ {
json.concat("\n"); json.concat("\n");

2
NukiWrapper.cpp
View File

@@ -218,7 +218,7 @@ void NukiWrapper::updateAuthData()
} }
delay(100); delay(100);
result = _nukiLock.retrieveLogEntries(0, 5, 1, false); result = _nukiLock.retrieveLogEntries(0, 10, 1, false);
if(result != Nuki::CmdResult::Success) if(result != Nuki::CmdResult::Success)
{ {
return; return;