From 283b87eb2a62f5c35dde7cdaf52bf773d883cda2 Mon Sep 17 00:00:00 2001
From: technyon <j.o.schuemann@gmx.de>
Date: Sun, 14 Aug 2022 10:21:37 +0200
Subject: [PATCH] fix publish opener log

---
 NetworkOpener.cpp     | 69 +++++++++++++++++++++++++++++++++++++++++--
 NetworkOpener.h       |  1 +
 NukiOpenerWrapper.cpp |  2 +-
 lib/nuki_ble          |  2 +-
 4 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/NetworkOpener.cpp b/NetworkOpener.cpp
index 94314d0..e6344db 100644
--- a/NetworkOpener.cpp
+++ b/NetworkOpener.cpp
@@ -182,7 +182,7 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
                 json.concat("\"trigger\": \""); json.concat(str); json.concat("\",\n");
 
                 memset(str, 0, sizeof(str));
-                NukiLock::completionStatusToString((NukiLock::CompletionStatus)log.data[3], str);
+                logactionCompletionStatusToString(log.data[3], str);
                 json.concat("\"completionStatus\": \""); json.concat(str); json.concat("\"\n");
                 break;
             case NukiOpener::LoggingType::KeypadAction:
@@ -212,8 +212,42 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
                         break;
                 }
                 json.concat("\",\n");
-                break;
 
+                json.concat("\"source\": \"");
+                switch(log.data[1])
+                {
+                    case 0:
+                        json.concat("Doorbell");
+                        break;
+                    case 1:
+                        json.concat("Timecontrol");
+                        break;
+                    case 2:
+                        json.concat("App");
+                        break;
+                    case 3:
+                        json.concat("Button");
+                        break;
+                    case 4:
+                        json.concat("Fob");
+                        break;
+                    case 5:
+                        json.concat("Bridge");
+                        break;
+                    case 6:
+                        json.concat("Keypad");
+                        break;
+                }
+                json.concat("\",\n");
+
+                json.concat("\"geofence\": \""); json.concat(log.data[2] == 1 ? "active" : "inactive"); json.concat("\",\n");
+                json.concat("\"doorbellSuppression\": \""); json.concat(log.data[3] == 1 ? "active" : "inactive"); json.concat("\",\n");
+
+                memset(str, 0, sizeof(str));
+                logactionCompletionStatusToString(log.data[5], str);
+                json.concat("\"completionStatus\": \""); json.concat(str); json.concat("\"\n");
+
+                break;
         }
 
         json.concat("}");
@@ -231,6 +265,37 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
     publishString(mqtt_topic_lock_log, json.c_str());
 }
 
+void NetworkOpener::logactionCompletionStatusToString(uint8_t value, char* out)
+{
+    switch (value)
+    {
+        case 0x00:
+            strcpy(out, "success");
+            break;
+        case 0x02:
+            strcpy(out, "cancelled");
+            break;
+        case 0x03:
+            strcpy(out, "tooRecent");
+            break;
+        case 0x04:
+            strcpy(out, "busy");
+            break;
+        case 0x08:
+            strcpy(out, "incomplete");
+            break;
+        case 0xfe:
+            strcpy(out, "otherError");
+            break;
+        case 0xff:
+            strcpy(out, "unknown");
+            break;
+        default:
+            strcpy(out, "undefined");
+            break;
+    }
+}
+
 void NetworkOpener::clearAuthorizationInfo()
 {
     publishString(mqtt_topic_lock_log, "");
diff --git a/NetworkOpener.h b/NetworkOpener.h
index 1fb89cd..6df5615 100644
--- a/NetworkOpener.h
+++ b/NetworkOpener.h
@@ -45,6 +45,7 @@ private:
 
     void buildMqttPath(const char* path, char* outPath);
     void subscribe(const char* path);
+    void logactionCompletionStatusToString(uint8_t value, char* out);
 
     Preferences* _preferences;
 
diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp
index d690fcc..e1d6d22 100644
--- a/NukiOpenerWrapper.cpp
+++ b/NukiOpenerWrapper.cpp
@@ -189,7 +189,7 @@ void NukiOpenerWrapper::updateAuthData()
     }
     delay(100);
 
-    result = _nukiOpener.retrieveLogEntries(0, 10, 1, false);
+    result = _nukiOpener.retrieveLogEntries(0, 5, 1, false);
     if(result != Nuki::CmdResult::Success)
     {
         return;
diff --git a/lib/nuki_ble b/lib/nuki_ble
index 9e95f5c..04c5c1d 160000
--- a/lib/nuki_ble
+++ b/lib/nuki_ble
@@ -1 +1 @@
-Subproject commit 9e95f5c9b3f3c9fc0b36cee315052473c316cb2f
+Subproject commit 04c5c1da09df5c0bac0a38443a35d12b35da162e