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

Fix authName

Browse Source
This commit is contained in:
iranl
2024-04-28 20:01:00 +02:00
parent 9b1097159d
commit 0e124f8e51
4 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
NetworkLock.cpp
View File

@@ -21,8 +21,6 @@ NetworkLock::NetworkLock(Network* network, Preferences* preferences, char* buffe
_configTopics.push_back(mqtt_topic_config_auto_lock); _configTopics.push_back(mqtt_topic_config_auto_lock);
_configTopics.push_back(mqtt_topic_config_single_lock); _configTopics.push_back(mqtt_topic_config_single_lock);
memset(authName, 0, sizeof(authName));
_network->registerMqttReceiver(this); _network->registerMqttReceiver(this);
} }
@@ -325,8 +323,8 @@ void NetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurne
} }
} }
json["auth_id"] = authId; json["auth_id"] = _authId;
json["auth_name"] = authName; json["auth_name"] = _authName;
serializeJson(json, _buffer, _bufferSize); serializeJson(json, _buffer, _bufferSize);
publishString(mqtt_topic_lock_json, _buffer); publishString(mqtt_topic_lock_json, _buffer);
@@ -372,8 +370,9 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
{ {
char str[50]; char str[50];
bool authFound = false; _authId = 0;
memset(authName, 0, sizeof(authName)); _authName = "";
_authFound = false;
JsonDocument json; JsonDocument json;
@@ -385,11 +384,11 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
break; break;
} }
--i; --i;
if((log.loggingType == NukiLock::LoggingType::LockAction || log.loggingType == NukiLock::LoggingType::KeypadAction) && ! authFound) if((log.loggingType == NukiLock::LoggingType::LockAction || log.loggingType == NukiLock::LoggingType::KeypadAction) && ! _authFound)
{ {
authFound = true; _authFound = true;
authId = log.authId; _authId = log.authId;
memcpy(authName, log.name, sizeof(log.name)); _authName = (char*)log.name;
} }
auto entry = json.add(); auto entry = json.add();
@@ -462,10 +461,10 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
serializeJson(json, _buffer, _bufferSize); serializeJson(json, _buffer, _bufferSize);
publishString(mqtt_topic_lock_log, _buffer); publishString(mqtt_topic_lock_log, _buffer);
if(authFound) if(_authFound)
{ {
publishUInt(mqtt_topic_lock_auth_id, authId); publishUInt(mqtt_topic_lock_auth_id, _authId);
publishString(mqtt_topic_lock_auth_name, authName); publishString(mqtt_topic_lock_auth_name, _authName);
} }
} }

5
NetworkLock.h
View File

@@ -85,8 +85,9 @@ private:
uint _keypadCommandId = 0; uint _keypadCommandId = 0;
int _keypadCommandEnabled = 1; int _keypadCommandEnabled = 1;
uint8_t _queryCommands = 0; uint8_t _queryCommands = 0;
uint32_t authId = 0; uint32_t _authId = 0;
char authName[33]; String _authName = "";
bool _authFound = false;
char* _buffer; char* _buffer;
size_t _bufferSize; size_t _bufferSize;

25
NetworkOpener.cpp
View File

@@ -17,8 +17,6 @@ NetworkOpener::NetworkOpener(Network* network, Preferences* preferences, char* b
_configTopics.push_back(mqtt_topic_config_led_enabled); _configTopics.push_back(mqtt_topic_config_led_enabled);
_configTopics.push_back(mqtt_topic_config_sound_level); _configTopics.push_back(mqtt_topic_config_sound_level);
memset(authName, 0, sizeof(authName));
_network->registerMqttReceiver(this); _network->registerMqttReceiver(this);
} }
@@ -297,8 +295,8 @@ void NetworkOpener::publishKeyTurnerState(const NukiOpener::OpenerState& keyTurn
publishBool(mqtt_topic_battery_critical, critical); publishBool(mqtt_topic_battery_critical, critical);
} }
json["auth_id"] = authId; json["auth_id"] = _authId;
json["auth_name"] = authName; json["auth_name"] = _authName;
serializeJson(json, _buffer, _bufferSize); serializeJson(json, _buffer, _bufferSize);
publishString(mqtt_topic_lock_json, _buffer); publishString(mqtt_topic_lock_json, _buffer);
@@ -359,8 +357,9 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
{ {
char str[50]; char str[50];
bool authFound = false; _authId = 0;
memset(authName, 0, sizeof(authName)); _authName = "";
_authFound = false;
JsonDocument json; JsonDocument json;
@@ -373,11 +372,11 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
} }
--i; --i;
if((log.loggingType == NukiOpener::LoggingType::LockAction || log.loggingType == NukiOpener::LoggingType::KeypadAction) && ! authFound) if((log.loggingType == NukiOpener::LoggingType::LockAction || log.loggingType == NukiOpener::LoggingType::KeypadAction) && ! _authFound)
{ {
authFound = true; _authFound = true;
authId = log.authId; _authId = log.authId;
memcpy(authName, log.name, sizeof(log.name)); _authName = (char*)log.name;
} }
auto entry = json.add(); auto entry = json.add();
@@ -475,10 +474,10 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
serializeJson(json, _buffer, _bufferSize); serializeJson(json, _buffer, _bufferSize);
publishString(mqtt_topic_lock_log, _buffer); publishString(mqtt_topic_lock_log, _buffer);
if(authFound) if(_authFound)
{ {
publishUInt(mqtt_topic_lock_auth_id, authId); publishUInt(mqtt_topic_lock_auth_id, _authId);
publishString(mqtt_topic_lock_auth_name, authName); publishString(mqtt_topic_lock_auth_name, _authName);
} }
} }

5
NetworkOpener.h
View File

@@ -86,8 +86,9 @@ private:
int _keypadCommandEnabled = 1; int _keypadCommandEnabled = 1;
unsigned long _resetRingStateTs = 0; unsigned long _resetRingStateTs = 0;
uint8_t _queryCommands = 0; uint8_t _queryCommands = 0;
uint32_t authId = 0; uint32_t _authId = 0;
char authName[33]; String _authName = "";
bool _authFound = false;
NukiOpener::LockState _currentLockState = NukiOpener::LockState::Undefined; NukiOpener::LockState _currentLockState = NukiOpener::LockState::Undefined;