From 6c256a8eb28514c825908625a7745d53251b11a1 Mon Sep 17 00:00:00 2001
From: technyon <j.o.schuemann@gmx.de>
Date: Tue, 10 Jan 2023 17:54:02 +0100
Subject: [PATCH] show ble address in web portal

---
 NukiOpenerWrapper.cpp | 5 +++++
 NukiOpenerWrapper.h   | 1 +
 NukiWrapper.cpp       | 5 +++++
 NukiWrapper.h         | 1 +
 WebCfgServer.cpp      | 4 ++--
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp
index d85b252..26a1374 100644
--- a/NukiOpenerWrapper.cpp
+++ b/NukiOpenerWrapper.cpp
@@ -305,6 +305,11 @@ const bool NukiOpenerWrapper::isPaired()
     return _paired;
 }
 
+const BLEAddress NukiOpenerWrapper::getBleAddress() const
+{
+    return _nukiOpener.getBleAddress();
+}
+
 BleScanner::Scanner *NukiOpenerWrapper::bleScanner()
 {
     return _bleScanner;
diff --git a/NukiOpenerWrapper.h b/NukiOpenerWrapper.h
index fa00602..434f0b1 100644
--- a/NukiOpenerWrapper.h
+++ b/NukiOpenerWrapper.h
@@ -23,6 +23,7 @@ public:
 
     const NukiOpener::OpenerState& keyTurnerState();
     const bool isPaired();
+    const BLEAddress getBleAddress() const;
 
     BleScanner::Scanner* bleScanner();
 
diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp
index 4dc4adf..d4d7575 100644
--- a/NukiWrapper.cpp
+++ b/NukiWrapper.cpp
@@ -576,3 +576,8 @@ void NukiWrapper::disableHASS()
         Log->println(F("Unable to disable HASS. Invalid config received."));
     }
 }
+
+const BLEAddress NukiWrapper::getBleAddress() const
+{
+    return _nukiLock.getBleAddress();
+}
diff --git a/NukiWrapper.h b/NukiWrapper.h
index 3f681d5..9e7c669 100644
--- a/NukiWrapper.h
+++ b/NukiWrapper.h
@@ -27,6 +27,7 @@ public:
     const NukiLock::KeyTurnerState& keyTurnerState();
     const bool isPaired();
     const bool hasKeypad();
+    const BLEAddress getBleAddress() const;
 
     void notify(Nuki::EventType eventType) override;
 
diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp
index 144d48c..a87bfaa 100644
--- a/WebCfgServer.cpp
+++ b/WebCfgServer.cpp
@@ -450,14 +450,14 @@ void WebCfgServer::buildHtml(String& response)
     {
         char lockstateArr[20];
         NukiLock::lockstateToString(_nuki->keyTurnerState().lockState, lockstateArr);
-        printParameter(response, "NUKI Lock paired", _nuki->isPaired() ? "Yes" : "No");
+        printParameter(response, "NUKI Lock paired", _nuki->isPaired() ? ("Yes (BLE Address " + _nuki->getBleAddress().toString() + ")").c_str() : "No");
         printParameter(response, "NUKI Lock state", lockstateArr);
     }
     if(_nukiOpener != nullptr)
     {
         char lockstateArr[20];
         NukiOpener::lockstateToString(_nukiOpener->keyTurnerState().lockState, lockstateArr);
-        printParameter(response, "NUKI Opener paired", _nukiOpener->isPaired() ? "Yes" : "No");
+        printParameter(response, "NUKI Opener paired", _nuki->isPaired() ? ("Yes (BLE Address " + _nukiOpener->getBleAddress().toString() + ")").c_str() : "No");
         printParameter(response, "NUKI Opener state", lockstateArr);
     }
     printParameter(response, "Firmware", version.c_str());