chore: update DigitalDoorKey

rednblkx · rednblkx · commit fd87cce3e046 · 2026-02-12T17:54:55.000+02:00
diff --git a/components/DigitalDoorKey b/components/DigitalDoorKey
@@ -1 +1 @@
-Subproject commit 04c682afb9ecd726ab14384245d0f36407084e66
+Subproject commit 147136813e3e31b9147f5b9b203354bfc6fcdadc
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -3,7 +3,7 @@ idf_component_register(SRCS "main.cpp" "ConfigManager.cpp" "ReaderDataManager.cp
                     "MqttManager.cpp" "HKServices.cpp" "NfcManager.cpp" "WebServerManager.cpp" "WebSocketLogSinker.cpp"
                     "ConsoleLogSinker.cpp"
                     INCLUDE_DIRS "include"
-                    PRIV_REQUIRES HomeSpan pn532_hal HK-HomeKit-Lib esp_http_server mqtt libsodium event_bus
+                    PRIV_REQUIRES HomeSpan pn532_hal DigitalDoorKey esp_http_server mqtt libsodium event_bus
                     msgpack-c json loggable loggable_espidf)
 
 include(FetchContent)
diff --git a/main/NfcManager.cpp b/main/NfcManager.cpp
@@ -1,11 +1,11 @@
 #include "NfcManager.hpp"
-#include "HomeKey.h"
+#include "DDKReaderData.h"
 #include "ReaderDataManager.hpp"
 #include "esp32-hal.h"
 #include "eventStructs.hpp"
 #include "fmt/ranges.h"
 #include "freertos/idf_additions.h"
-#include "hkAuthContext.h"
+#include "DDKAuthContext.h"
 #include "pn532_hal/spi.hpp"
 #include "soc/gpio_num.h"
 #include "utils.hpp"
@@ -159,7 +159,7 @@ void NfcManager::authPrecomputeTask() {
              uxQueueMessagesWaiting(m_authCtxReadyQueue));
 
     auto startTime = std::chrono::high_resolution_clock::now();
-    item->ctx = new (std::nothrow) HKAuthenticationContext(kHomeKey, item->nfcFn, item->readerData, item->saveFn);
+    item->ctx = new (std::nothrow) DDKAuthenticationContext(kHomeKey, item->nfcFn, item->readerData, item->saveFn);
     auto stopTime = std::chrono::high_resolution_clock::now();
     const auto durationMs =
         std::chrono::duration_cast<std::chrono::milliseconds>(stopTime - startTime).count();
@@ -504,8 +504,7 @@ void NfcManager::handleHomeKeyAuth() {
             m_readerDataManager.updateReaderData(data);
             invalidateAuthCache();
         };
-        //
-        HKAuthenticationContext authCtx(kHomeKey, nfcFn, readerData, saveFn);
+        DDKAuthenticationContext authCtx(kHomeKey, nfcFn, readerData, saveFn);
         auto authResult = authCtx.authenticate(authFlow);
         publishAuthResult(authResult, readerData.reader_id);
     };
diff --git a/main/include/NfcManager.hpp b/main/include/NfcManager.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "HomeKey.h"
+#include "DDKReaderData.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/queue.h"
 #include "freertos/task.h"
@@ -14,7 +14,7 @@ class LockManager;
 class HardwareManager;
 class ReaderDataManager;
 class MqttManager;
-class HKAuthenticationContext;
+class DDKAuthenticationContext;
 namespace espConfig { struct misc_config_t; }
 
 class NfcManager {
@@ -42,7 +42,7 @@ class NfcManager {
         readerData_t readerData;
         std::function<bool(std::vector<uint8_t>&, std::vector<uint8_t>&, bool)> nfcFn;
         std::function<void(const readerData_t&)> saveFn;
-        HKAuthenticationContext* ctx = nullptr;
+        DDKAuthenticationContext* ctx = nullptr;
         uint32_t generation = 0;
     };
 
diff --git a/main/include/ReaderDataManager.hpp b/main/include/ReaderDataManager.hpp
@@ -2,7 +2,7 @@
 #include <vector>
 #include <mutex>
 #include <nvs.h>
-#include "HomeKey.h"
+#include "DDKReaderData.h"
 #include "msgpack/object.h"
 #include "msgpack/pack.h"
 
