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

replace PubSubClient with arduino mqtt lib

Browse Source
This commit is contained in:
technyon
2023-01-16 20:41:08 +01:00
parent fd852ac400
commit 6127fc331e
78 changed files with 3042 additions and 4096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
NetworkLock.cpp
View File

@@ -71,7 +71,7 @@ void NetworkLock::initialize()
}
}
void NetworkLock::onMqttDataReceived(char *&topic, byte *&payload, unsigned int &length)
void NetworkLock::onMqttDataReceived(const char* topic, byte* payload, const unsigned int length)
{
char value[50] = {0};
size_t l = min(length, sizeof(value)-1);
@@ -120,8 +120,8 @@ void NetworkLock::onMqttDataReceived(char *&topic, byte *&payload, unsigned int
publishString(mqtt_topic_keypad_command_action, "--");
}
publishInt(mqtt_topic_keypad_command_id, _keypadCommandId);
publishString(mqtt_topic_keypad_command_name, _keypadCommandName.c_str());
publishString(mqtt_topic_keypad_command_code, _keypadCommandCode.c_str());
publishString(mqtt_topic_keypad_command_name, _keypadCommandName);
publishString(mqtt_topic_keypad_command_code, _keypadCommandCode);
publishInt(mqtt_topic_keypad_command_enabled, _keypadCommandEnabled);
}
}
@@ -341,7 +341,7 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
}
json.concat("]");
publishString(mqtt_topic_lock_log, json.c_str());
publishString(mqtt_topic_lock_log, json);
if(authFound)
{
@@ -390,12 +390,12 @@ void NetworkLock::publishRssi(const int& rssi)
void NetworkLock::publishRetry(const std::string& message)
{
publishString(mqtt_topic_lock_retry, message.c_str());
publishString(mqtt_topic_lock_retry, message);
}
void NetworkLock::publishBleAddress(const std::string &address)
{
publishString(mqtt_topic_lock_address, address.c_str());
publishString(mqtt_topic_lock_address, address);
}
void NetworkLock::publishKeypad(const std::list<NukiLock::KeypadEntry>& entries, uint maxKeypadCodeCount)
@@ -507,6 +507,22 @@ void NetworkLock::publishBool(const char *topic, const bool value)
_network->publishBool(_mqttPath, topic, value);
}
bool NetworkLock::publishString(const char *topic, const String &value)
{
char str[value.length() + 1];
memset(str, 0, sizeof(str));
memcpy(str, value.begin(), value.length());
return publishString(topic, str);
}
bool NetworkLock::publishString(const char *topic, const std::string &value)
{
char str[value.size() + 1];
memset(str, 0, sizeof(str));
memcpy(str, value.data(), value.length());
return publishString(topic, str);
}
bool NetworkLock::publishString(const char *topic, const char *value)
{
return _network->publishString(_mqttPath, topic, value);