pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-02 18:59:56 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #819 from thebentern/patch-1

Browse Source 
Convert MQTT server user preference to hostname:port
This commit is contained in:
Kevin Hester 2021-07-26 04:30:52 +08:00 committed by GitHub
commit 19ffddb02e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mqtt/MQTT.cpp
View File

@ -62,12 +62,21 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), pubSub(mqttClient)
void MQTT::reconnect()
{
// pubSub.setServer("devsrv.ezdevice.net", 1883); or 192.168.10.188
const char *serverAddr = "mqtt.meshtastic.org"; // default hostname
const char *serverAddr = "mqtt.meshtastic.org:1883"; // default hostname
if (*radioConfig.preferences.mqtt_server)
serverAddr = radioConfig.preferences.mqtt_server; // Override the default
pubSub.setServer(serverAddr, 1883);
String server = String(serverAddr);
int delimIndex = server.indexOf(':');
if (delimIndex > 0) {
String host = server.substring(0, delimIndex);
String port = server.substring(delimIndex+1, server.length());
pubSub.setServer(host.c_str(), port.toInt());
}
else {
pubSub.setServer(serverAddr, 1883);
}
DEBUG_MSG("Connecting to MQTT server\n", serverAddr);
auto myStatus = (statusTopic + owner.id);