diff --git a/Config.h b/Config.h index 50e1fd1..d5e952b 100644 --- a/Config.h +++ b/Config.h @@ -1,6 +1,6 @@ #pragma once -#define NUKI_HUB_VERSION "8.18-pre-1" +#define NUKI_HUB_VERSION "8.18-pre-3" #define MQTT_QOS_LEVEL 1 #define MQTT_CLEAN_SESSIONS false diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp index 9ce61c5..9bd9104 100644 --- a/NukiOpenerWrapper.cpp +++ b/NukiOpenerWrapper.cpp @@ -589,12 +589,12 @@ const NukiOpener::OpenerState &NukiOpenerWrapper::keyTurnerState() return _keyTurnerState; } -const bool NukiOpenerWrapper::isPaired() +const bool NukiOpenerWrapper::isPaired() const { return _paired; } -const bool NukiOpenerWrapper::hasKeypad() +const bool NukiOpenerWrapper::hasKeypad() const { return _hasKeypad; } diff --git a/NukiOpenerWrapper.h b/NukiOpenerWrapper.h index 51dd574..01a903a 100644 --- a/NukiOpenerWrapper.h +++ b/NukiOpenerWrapper.h @@ -25,8 +25,8 @@ public: void disableWatchdog(); const NukiOpener::OpenerState& keyTurnerState(); - const bool isPaired(); - const bool hasKeypad(); + const bool isPaired() const; + const bool hasKeypad() const; const BLEAddress getBleAddress() const; std::string firmwareVersion() const; diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp index 5fd20d8..35d828a 100644 --- a/NukiWrapper.cpp +++ b/NukiWrapper.cpp @@ -615,12 +615,12 @@ const NukiLock::KeyTurnerState &NukiWrapper::keyTurnerState() return _keyTurnerState; } -const bool NukiWrapper::isPaired() +const bool NukiWrapper::isPaired() const { return _paired; } -const bool NukiWrapper::hasKeypad() +const bool NukiWrapper::hasKeypad() const { return _hasKeypad; } @@ -667,7 +667,7 @@ void NukiWrapper::setupHASS() Log->println("HASS setup for lock completed."); } -bool NukiWrapper::hasDoorSensor() +bool NukiWrapper::hasDoorSensor() const { return _keyTurnerState.doorSensorState == Nuki::DoorSensorState::DoorClosed || _keyTurnerState.doorSensorState == Nuki::DoorSensorState::DoorOpened || diff --git a/NukiWrapper.h b/NukiWrapper.h index 9ac1080..081530f 100644 --- a/NukiWrapper.h +++ b/NukiWrapper.h @@ -28,8 +28,9 @@ public: void disableWatchdog(); const NukiLock::KeyTurnerState& keyTurnerState(); - const bool isPaired(); - const bool hasKeypad(); + const bool isPaired() const; + const bool hasKeypad() const; + bool hasDoorSensor() const; const BLEAddress getBleAddress() const; std::string firmwareVersion() const; @@ -55,7 +56,6 @@ private: void readAdvancedConfig(); void setupHASS(); - bool hasDoorSensor(); void printCommandResult(Nuki::CmdResult result); diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp index ef47f8c..85dbfff 100644 --- a/WebCfgServer.cpp +++ b/WebCfgServer.cpp @@ -808,6 +808,10 @@ void WebCfgServer::buildInfoHtml(String &response) response.concat(_nuki->isPaired() ? "Yes\n" : "No\n"); response.concat("Lock PIN set: "); response.concat(_nuki->isPaired() ? _nuki->isPinSet() ? "Yes\n" : "No\n" : "-\n"); + response.concat("Lock has door sensor: "); + response.concat(_nuki->hasDoorSensor() ? "Yes\n" : "No\n"); + response.concat("Lock has keypad: "); + response.concat(_nuki->hasKeypad() ? "Yes\n" : "No\n"); } if(_nukiOpener != nullptr) { @@ -818,6 +822,8 @@ void WebCfgServer::buildInfoHtml(String &response) response.concat(_nukiOpener->isPaired() ? "Yes\n" : "No\n"); response.concat("Opener PIN set: "); response.concat(_nukiOpener->isPaired() ? _nukiOpener->isPinSet() ? "Yes\n" : "No\n" : "-\n"); + response.concat("Opener has keypad: "); + response.concat(_nukiOpener->hasKeypad() ? "Yes\n" : "No\n"); } response.concat("Network device: ");