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

show ble address in web portal

Browse Source
This commit is contained in:
technyon
2023-01-10 17:54:02 +01:00
parent 7b3e15832a
commit 6c256a8eb2
5 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
NukiOpenerWrapper.cpp
View File

@@ -305,6 +305,11 @@ const bool NukiOpenerWrapper::isPaired()
return _paired; return _paired;
} }
const BLEAddress NukiOpenerWrapper::getBleAddress() const
{
return _nukiOpener.getBleAddress();
}
BleScanner::Scanner *NukiOpenerWrapper::bleScanner() BleScanner::Scanner *NukiOpenerWrapper::bleScanner()
{ {
return _bleScanner; return _bleScanner;

1
NukiOpenerWrapper.h
View File

@@ -23,6 +23,7 @@ public:
const NukiOpener::OpenerState& keyTurnerState(); const NukiOpener::OpenerState& keyTurnerState();
const bool isPaired(); const bool isPaired();
const BLEAddress getBleAddress() const;
BleScanner::Scanner* bleScanner(); BleScanner::Scanner* bleScanner();

5
NukiWrapper.cpp
View File

@@ -576,3 +576,8 @@ void NukiWrapper::disableHASS()
Log->println(F("Unable to disable HASS. Invalid config received.")); Log->println(F("Unable to disable HASS. Invalid config received."));
} }
} }
const BLEAddress NukiWrapper::getBleAddress() const
{
return _nukiLock.getBleAddress();
}

1
NukiWrapper.h
View File

@@ -27,6 +27,7 @@ public:
const NukiLock::KeyTurnerState& keyTurnerState(); const NukiLock::KeyTurnerState& keyTurnerState();
const bool isPaired(); const bool isPaired();
const bool hasKeypad(); const bool hasKeypad();
const BLEAddress getBleAddress() const;
void notify(Nuki::EventType eventType) override; void notify(Nuki::EventType eventType) override;

4
WebCfgServer.cpp
View File

@@ -450,14 +450,14 @@ void WebCfgServer::buildHtml(String& response)
{ {
char lockstateArr[20]; char lockstateArr[20];
NukiLock::lockstateToString(_nuki->keyTurnerState().lockState, lockstateArr); 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); printParameter(response, "NUKI Lock state", lockstateArr);
} }
if(_nukiOpener != nullptr) if(_nukiOpener != nullptr)
{ {
char lockstateArr[20]; char lockstateArr[20];
NukiOpener::lockstateToString(_nukiOpener->keyTurnerState().lockState, lockstateArr); 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, "NUKI Opener state", lockstateArr);
} }
printParameter(response, "Firmware", version.c_str()); printParameter(response, "Firmware", version.c_str());