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

also show lock state in config page

Browse Source
This commit is contained in:
technyon
2022-04-07 22:08:09 +02:00
parent 300e2b9cbd
commit ac8ec6022a
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
NukiWrapper.cpp
View File

@@ -12,10 +12,11 @@ NukiWrapper::NukiWrapper(const std::string& deviceName, uint32_t id, Network* ne
{ {
nukiInst = this; nukiInst = this;
memset(&_keyTurnerState, sizeof(Nuki::KeyTurnerState), 0);
memset(&_lastKeyTurnerState, sizeof(Nuki::KeyTurnerState), 0); memset(&_lastKeyTurnerState, sizeof(Nuki::KeyTurnerState), 0);
memset(&_lastBatteryReport, sizeof(Nuki::BatteryReport), 0); memset(&_lastBatteryReport, sizeof(Nuki::BatteryReport), 0);
memset(&_batteryReport, sizeof(Nuki::BatteryReport), 0); memset(&_batteryReport, sizeof(Nuki::BatteryReport), 0);
memset(&_keyTurnerState, sizeof(Nuki::KeyTurnerState), 0);
_keyTurnerState.lockState = Nuki::LockState::Undefined;
network->setLockActionReceived(nukiInst->onLockActionReceived); network->setLockActionReceived(nukiInst->onLockActionReceived);
} }
@@ -154,6 +155,11 @@ void NukiWrapper::onLockActionReceived(const char *value)
nukiInst->_nextLockAction = nukiInst->lockActionToEnum(value); nukiInst->_nextLockAction = nukiInst->lockActionToEnum(value);
} }
const Nuki::KeyTurnerState &NukiWrapper::keyTurnerState()
{
return _keyTurnerState;
}
const bool NukiWrapper::isPaired() const bool NukiWrapper::isPaired()
{ {
return _paired; return _paired;

1
NukiWrapper.h
View File

@@ -14,6 +14,7 @@ public:
void initialize(); void initialize();
void update(); void update();
const Nuki::KeyTurnerState& keyTurnerState();
const bool isPaired(); const bool isPaired();
BleScanner* bleScanner(); BleScanner* bleScanner();

6
WebCfgServer.cpp
View File

@@ -197,9 +197,15 @@ void WebCfgServer::buildHtml(String& response)
String version = " "; String version = " ";
version.concat(nuki_hub_version); version.concat(nuki_hub_version);
char lockstateArr[20];
Nuki::lockstateToString(_nuki->keyTurnerState().lockState, lockstateArr);
String lockState = " ";
lockState.concat(lockstateArr);
response.concat("<table>"); response.concat("<table>");
printParameter(response, "Paired", _nuki->isPaired() ? "&nbsp;Yes" : "&nbsp;No"); printParameter(response, "Paired", _nuki->isPaired() ? "&nbsp;Yes" : "&nbsp;No");
printParameter(response, "MQTT Connected", _network->isMqttConnected() ? "&nbsp;Yes" : "&nbsp;No"); printParameter(response, "MQTT Connected", _network->isMqttConnected() ? "&nbsp;Yes" : "&nbsp;No");
printParameter(response, "Lock state", lockState.c_str());
printParameter(response, "Firmware", version.c_str()); printParameter(response, "Firmware", version.c_str());
response.concat("</table><br><br>"); response.concat("</table><br><br>");