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

set mqtt hostname

Browse Source
This commit is contained in:
technyon
2023-01-16 20:50:03 +01:00
parent 6127fc331e
commit 302f6ca7ef
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Network.cpp
View File

@@ -127,7 +127,7 @@ void Network::initialize()
Log->print(F(":")); Log->print(F(":"));
Log->println(port); Log->println(port);
// _device->mqttClient()->connect(_mqttBrokerAddr, port); _device->mqttClient()->setId(_preferences->getString(preference_hostname));
_networkTimeout = _preferences->getInt(preference_network_timeout); _networkTimeout = _preferences->getInt(preference_network_timeout);
if(_networkTimeout == 0) if(_networkTimeout == 0)
@@ -241,14 +241,13 @@ bool Network::reconnect()
if(strlen(_mqttUser) == 0) if(strlen(_mqttUser) == 0)
{ {
Log->println(F("MQTT: Connecting without credentials")); Log->println(F("MQTT: Connecting without credentials"));
// success = _device->mqttClient()->connect(_preferences->getString(preference_hostname).c_str()) > 0;
success = _device->mqttClient()->connect(_mqttBrokerAddr, port); success = _device->mqttClient()->connect(_mqttBrokerAddr, port);
} }
else else
{ {
Log->print(F("MQTT: Connecting with user: ")); Log->println(_mqttUser); Log->print(F("MQTT: Connecting with user: ")); Log->println(_mqttUser);
_device->mqttClient()->setUsernamePassword(_mqttUser, _mqttPass); _device->mqttClient()->setUsernamePassword(_mqttUser, _mqttPass);
success = _device->mqttClient()->connect(_preferences->getString(preference_hostname).c_str()) > 0; success = _device->mqttClient()->connect(_mqttBrokerAddr, port);
} }
if (success) if (success)
@@ -259,7 +258,6 @@ bool Network::reconnect()
_device->mqttClient()->onMessage(Network::onMqttDataReceivedCallback); _device->mqttClient()->onMessage(Network::onMqttDataReceivedCallback);
for(const String& topic : _subscribedTopics) for(const String& topic : _subscribedTopics)
{ {
Serial.println(topic.c_str());
_device->mqttClient()->subscribe(topic.c_str()); _device->mqttClient()->subscribe(topic.c_str());
} }
if(_firstConnect) if(_firstConnect)
@@ -334,7 +332,7 @@ void Network::onMqttDataReceivedCallback(int messageSize)
_inst->onMqttDataReceived(messageSize); _inst->onMqttDataReceived(messageSize);
} }
void Network::onMqttDataReceived(int messageSize) void Network::onMqttDataReceived(int)
{ {
MqttClient* mqttClient = _device->mqttClient(); MqttClient* mqttClient = _device->mqttClient();
String topic = mqttClient->messageTopic(); String topic = mqttClient->messageTopic();