diff --git a/NetworkOpener.cpp b/NetworkOpener.cpp index fd8093a..b804c4e 100644 --- a/NetworkOpener.cpp +++ b/NetworkOpener.cpp @@ -97,7 +97,7 @@ void NetworkOpener::onMqttDataReceived(char *&topic, byte *&payload, unsigned in } } -void NetworkOpener::publishKeyTurnerState(const NukiOpener::KeyTurnerState& keyTurnerState, const NukiOpener::KeyTurnerState& lastKeyTurnerState) +void NetworkOpener::publishKeyTurnerState(const NukiOpener::OpenerState& keyTurnerState, const NukiOpener::OpenerState& lastKeyTurnerState) { char str[50]; diff --git a/NetworkOpener.h b/NetworkOpener.h index 2bcb1b1..5371ab7 100644 --- a/NetworkOpener.h +++ b/NetworkOpener.h @@ -20,7 +20,7 @@ public: void initialize(); void update(); - void publishKeyTurnerState(const NukiOpener::KeyTurnerState& keyTurnerState, const NukiOpener::KeyTurnerState& lastKeyTurnerState); + void publishKeyTurnerState(const NukiOpener::OpenerState& keyTurnerState, const NukiOpener::OpenerState& lastKeyTurnerState); void publishAuthorizationInfo(const uint32_t authId, const char* authName); void publishCommandResult(const char* resultStr); void publishBatteryReport(const NukiOpener::BatteryReport& batteryReport); diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp index 675c71a..dda340e 100644 --- a/NukiOpenerWrapper.cpp +++ b/NukiOpenerWrapper.cpp @@ -129,7 +129,7 @@ void NukiOpenerWrapper::update() _clearAuthData = false; } - memcpy(&_lastKeyTurnerState, &_keyTurnerState, sizeof(NukiOpener::KeyTurnerState)); + memcpy(&_lastKeyTurnerState, &_keyTurnerState, sizeof(NukiOpener::OpenerState)); } void NukiOpenerWrapper::setPin(const uint16_t pin) @@ -258,7 +258,7 @@ void NukiOpenerWrapper::onConfigUpdateReceived(const char *topic, const char *va } } -const NukiOpener::KeyTurnerState &NukiOpenerWrapper::keyTurnerState() +const NukiOpener::OpenerState &NukiOpenerWrapper::keyTurnerState() { return _keyTurnerState; } diff --git a/NukiOpenerWrapper.h b/NukiOpenerWrapper.h index 40d148e..b76af46 100644 --- a/NukiOpenerWrapper.h +++ b/NukiOpenerWrapper.h @@ -19,7 +19,7 @@ public: void unpair(); - const NukiOpener::KeyTurnerState& keyTurnerState(); + const NukiOpener::OpenerState& keyTurnerState(); const bool isPaired(); BleScanner::Scanner* bleScanner(); @@ -52,8 +52,8 @@ private: bool _publishAuthData = false; bool _clearAuthData = false; - NukiOpener::KeyTurnerState _lastKeyTurnerState; - NukiOpener::KeyTurnerState _keyTurnerState; + NukiOpener::OpenerState _lastKeyTurnerState; + NukiOpener::OpenerState _keyTurnerState; uint32_t _lastAuthId = 0xffff; diff --git a/lib/nuki_ble b/lib/nuki_ble index cab8d77..8247236 160000 --- a/lib/nuki_ble +++ b/lib/nuki_ble @@ -1 +1 @@ -Subproject commit cab8d778c911e5f5a93e3c889eb970a3a6060cdd +Subproject commit 82472362d8a0ea2cbabc968406433d8d1fbccbb7